From 356d71003eeb28bc90417f769c0396a9dfc5b0da Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Thu, 9 Apr 1998 14:14:20 +0000 Subject: [PATCH] Update. 1998-04-07 Andreas Jaeger * sysdeps/unix/sysv/linux/bits/sockunion.h: Fix error message. * manual/socket.texi (Interface Naming): Fix typo. 1998-04-07 Andreas Jaeger * manual/examples/filesrv.c (main): Remove filename first. * manual/socket.texi (Address Formats): Change ?F_LOCAL, ?F_FILE, ?F_UNIX. * manual/examples/mkfsock.c (make_named_socket): Use PF_LOCAL instead of PF_UNIX. * manual/examples/filecli.c (main): Use AF_LOCAL instead of AF_UNIX. 1998-04-09 Ulrich Drepper * sysdeps/libm-ieee754/s_signgam.c: Define __signgam and make signgam weak alias. * sysdeps/libm-ieee754/w_lgamma.c: Use __signgam not signgam. * sysdeps/libm-ieee754/w_lgammaf.c: Likewise. * sysdeps/libm-ieee754/w_lgammal.c: Likewise. * sysdeps/libm-ieee754/w_gamma.c: Likewise. * sysdeps/libm-ieee754/w_gammaf.c: Likewise. * sysdeps/libm-ieee754/w_gammal.c: Likewise. * login/utmp_daemon.c (open_socket): Use __connect not connect. * sysdeps/unix/bsd/bsd4.4/bits/sockaddr.h (SA_LEN): New macro. * Makerules: Re-add missing rule for $(objpfx)stamp.oS. --- ChangeLog | 36 ++++++++++++++++++++++-- login/utmp_daemon.c | 2 +- manual/examples/filecli.c | 2 +- manual/examples/filesrv.c | 4 ++- manual/examples/mkfsock.c | 2 +- manual/socket.texi | 29 +++++++++---------- sysdeps/libm-ieee754/s_signgam.c | 3 +- sysdeps/libm-ieee754/w_gamma.c | 4 ++- sysdeps/libm-ieee754/w_gammaf.c | 4 ++- sysdeps/libm-ieee754/w_gammal.c | 4 ++- sysdeps/libm-ieee754/w_lgamma.c | 6 ++-- sysdeps/libm-ieee754/w_lgammaf.c | 10 +++---- sysdeps/libm-ieee754/w_lgammal.c | 6 ++-- sysdeps/unix/sysv/linux/bits/sockunion.h | 2 +- 14 files changed, 77 insertions(+), 37 deletions(-) diff --git a/ChangeLog b/ChangeLog index fad9d3dd7e..3a8ed546ef 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,35 @@ +1998-04-07 Andreas Jaeger + + * sysdeps/unix/sysv/linux/bits/sockunion.h: Fix error message. + + * manual/socket.texi (Interface Naming): Fix typo. + +1998-04-07 Andreas Jaeger + + * manual/examples/filesrv.c (main): Remove filename first. + + * manual/socket.texi (Address Formats): Change ?F_LOCAL, ?F_FILE, + ?F_UNIX. + + * manual/examples/mkfsock.c (make_named_socket): Use PF_LOCAL + instead of PF_UNIX. + + * manual/examples/filecli.c (main): Use AF_LOCAL + instead of AF_UNIX. + +1998-04-09 Ulrich Drepper + + * sysdeps/libm-ieee754/s_signgam.c: Define __signgam and make + signgam weak alias. + * sysdeps/libm-ieee754/w_lgamma.c: Use __signgam not signgam. + * sysdeps/libm-ieee754/w_lgammaf.c: Likewise. + * sysdeps/libm-ieee754/w_lgammal.c: Likewise. + * sysdeps/libm-ieee754/w_gamma.c: Likewise. + * sysdeps/libm-ieee754/w_gammaf.c: Likewise. + * sysdeps/libm-ieee754/w_gammal.c: Likewise. + + * login/utmp_daemon.c (open_socket): Use __connect not connect. + 1998-04-08 Andreas Schwab * configure.in: Add new option --enable-force-install. Substitute @@ -266,7 +298,7 @@ (getnodebyname): New prototype. (AI_V4MAPPED, et al.): New constants. - * sysdeps/unix/bsd/bsd4.4/bits/sockaddr.h (SA_LEN): New macro.< + * sysdeps/unix/bsd/bsd4.4/bits/sockaddr.h (SA_LEN): New macro. * sysdeps/generic/bits/sockaddr.h (SA_LEN): Likewise. * sysdeps/unix/sysv/linux/Makefile (sysdep_routines): Add sa_len for socket. @@ -342,7 +374,7 @@ * Makeconfig (libtypes): Redo H.J. Lu's change of 1998-03-27. - * Makerules: Readd missing rule for $(objpfx)stamp.oS. + * Makerules: Re-add missing rule for $(objpfx)stamp.oS. 1998-04-06 Thorsten Kukuk diff --git a/login/utmp_daemon.c b/login/utmp_daemon.c index 40389f21a0..6b4686ddd7 100644 --- a/login/utmp_daemon.c +++ b/login/utmp_daemon.c @@ -415,7 +415,7 @@ open_socket (const char *name) addr.sun_family = AF_UNIX; strcpy (addr.sun_path, name); - if (connect (sock, (struct sockaddr *) &addr, sizeof (addr)) < 0) + if (__connect (sock, (struct sockaddr *) &addr, sizeof (addr)) < 0) { close (sock); return -1; diff --git a/manual/examples/filecli.c b/manual/examples/filecli.c index b77ae6763e..9f64445fa9 100644 --- a/manual/examples/filecli.c +++ b/manual/examples/filecli.c @@ -24,7 +24,7 @@ main (void) sock = make_named_socket (CLIENT); /* Initialize the server socket address. */ - name.sun_family = AF_UNIX; + name.sun_family = AF_LOCAL; strcpy (name.sun_path, SERVER); size = strlen (name.sun_path) + sizeof (name.sun_family); diff --git a/manual/examples/filesrv.c b/manual/examples/filesrv.c index 3596b99982..32507c6555 100644 --- a/manual/examples/filesrv.c +++ b/manual/examples/filesrv.c @@ -16,8 +16,10 @@ main (void) size_t size; int nbytes; - /* Make the socket, then loop endlessly. */ + /* Remove the filename first, it's ok if the call fails */ + unlink (SERVER); + /* Make the socket, then loop endlessly. */ sock = make_named_socket (SERVER); while (1) { diff --git a/manual/examples/mkfsock.c b/manual/examples/mkfsock.c index 8683fbdc54..c6603af0ae 100644 --- a/manual/examples/mkfsock.c +++ b/manual/examples/mkfsock.c @@ -13,7 +13,7 @@ make_named_socket (const char *filename) size_t size; /* Create the socket. */ - sock = socket (PF_UNIX, SOCK_DGRAM, 0); + sock = socket (PF_LOCAL, SOCK_DGRAM, 0); if (sock < 0) { perror ("socket"); diff --git a/manual/socket.texi b/manual/socket.texi index 025abcf58a..14d1644d31 100644 --- a/manual/socket.texi +++ b/manual/socket.texi @@ -328,27 +328,26 @@ corresponding namespace. Here is a list of address format names: @table @code @comment sys/socket.h -@comment GNU -@item AF_FILE -@vindex AF_FILE -This designates the address format that goes with the file namespace. -(@code{PF_FILE} is the name of that namespace.) @xref{Local Namespace +@comment POSIX +@item AF_LOCAL +@vindex AF_LOCAL +This designates the address format that goes with the local namespace. +(@code{PF_LOCAL} is the name of that namespace.) @xref{Local Namespace Details}, for information about this address format. @comment sys/socket.h @comment BSD @item AF_UNIX @vindex AF_UNIX -This is a synonym for @code{AF_FILE}, for compatibility. -(@code{PF_UNIX} is likewise a synonym for @code{PF_FILE}.) +This is a synonym for @code{AF_LOCAL}, for compatibility. +(@code{PF_UNIX} is likewise a synonym for @code{PF_LOCAL}.) @comment sys/socket.h -@comment BSD -@item AF_UNIX -@vindex AF_LOCAL -This is another synonym for @code{AF_FILE}, for compatibility. -(@code{PF_LOCAL} is likewise a synonym for @code{PF_FILE}.) -@strong{POSIX? XXX} +@comment GNU +@item AF_FILE +@vindex AF_FILE +This is another synonym for @code{AF_LOCAL}, for compatibility. +(@code{PF_FILE} is likewise a synonym for @code{PF_LOCAL}.) @comment sys/socket.h @comment BSD @@ -483,7 +482,7 @@ might be @code{lo} (the loopback interface) and @code{eth0} (the first Ethernet interface). Although such names are convenient for humans, it would be clumsy to -have to use them whenever a program needed to refer to an interface. In +have to use them whenever a program needs to refer to an interface. In such situations an interface is referred to by its @dfn{index}, which is an arbitrarily-assigned small positive integer. @@ -1953,7 +1952,7 @@ connection in progress (see @code{EINPROGRESS} above). This function is defined as a cancelation point in multi-threaded programs. So one has to be prepared for this and make sure that possibly allocated resources (like memory, files descriptors, -semaphores or whatever) are freed even if the thread is cancel. +semaphores or whatever) are freed even if the thread is canceled. @c @xref{pthread_cleanup_push}, for a method how to do this. @end deftypefun diff --git a/sysdeps/libm-ieee754/s_signgam.c b/sysdeps/libm-ieee754/s_signgam.c index d67d5918ec..2ab5924a2a 100644 --- a/sysdeps/libm-ieee754/s_signgam.c +++ b/sysdeps/libm-ieee754/s_signgam.c @@ -1,3 +1,4 @@ #include "math.h" #include "math_private.h" -int signgam = 0; +int __signgam = 0; +weak_alias (__signgam, signgam) diff --git a/sysdeps/libm-ieee754/w_gamma.c b/sysdeps/libm-ieee754/w_gamma.c index 02a3d47669..7629503744 100644 --- a/sysdeps/libm-ieee754/w_gamma.c +++ b/sysdeps/libm-ieee754/w_gamma.c @@ -22,6 +22,8 @@ static char rcsid[] = "$NetBSD: w_gamma.c,v 1.7 1995/11/20 22:06:43 jtc Exp $"; #include "math.h" #include "math_private.h" +extern int __signgam; + #ifdef __STDC__ double __gamma(double x) #else @@ -32,7 +34,7 @@ static char rcsid[] = "$NetBSD: w_gamma.c,v 1.7 1995/11/20 22:06:43 jtc Exp $"; double y; #ifndef _IEEE_LIBM if (_LIB_VERSION == _SVID_) - y = __ieee754_lgamma_r(x,&signgam); + y = __ieee754_lgamma_r(x,&__signgam); else { #endif diff --git a/sysdeps/libm-ieee754/w_gammaf.c b/sysdeps/libm-ieee754/w_gammaf.c index 7d78a52908..fc28a975da 100644 --- a/sysdeps/libm-ieee754/w_gammaf.c +++ b/sysdeps/libm-ieee754/w_gammaf.c @@ -20,6 +20,8 @@ static char rcsid[] = "$NetBSD: w_gammaf.c,v 1.4 1995/11/20 22:06:48 jtc Exp $"; #include "math.h" #include "math_private.h" +extern int __signgam; + #ifdef __STDC__ float __gammaf(float x) #else @@ -30,7 +32,7 @@ static char rcsid[] = "$NetBSD: w_gammaf.c,v 1.4 1995/11/20 22:06:48 jtc Exp $"; float y; #ifndef _IEEE_LIBM if (_LIB_VERSION == _SVID_) - y = __ieee754_lgammaf_r(x,&signgam); + y = __ieee754_lgammaf_r(x,&__signgam); else { #endif diff --git a/sysdeps/libm-ieee754/w_gammal.c b/sysdeps/libm-ieee754/w_gammal.c index 1b4ae2cc7b..88c681b40b 100644 --- a/sysdeps/libm-ieee754/w_gammal.c +++ b/sysdeps/libm-ieee754/w_gammal.c @@ -25,6 +25,8 @@ static char rcsid[] = "$NetBSD: $"; #include "math.h" #include "math_private.h" +extern int __signgam; + #ifdef __STDC__ long double __gammal(long double x) #else @@ -35,7 +37,7 @@ static char rcsid[] = "$NetBSD: $"; long double y; #ifndef _IEEE_LIBM if (_LIB_VERSION == _SVID_) - y = __ieee754_lgammal_r(x,&signgam); + y = __ieee754_lgammal_r(x,&__signgam); else { #endif diff --git a/sysdeps/libm-ieee754/w_lgamma.c b/sysdeps/libm-ieee754/w_lgamma.c index be8a174742..fbb933f9fc 100644 --- a/sysdeps/libm-ieee754/w_lgamma.c +++ b/sysdeps/libm-ieee754/w_lgamma.c @@ -23,7 +23,7 @@ static char rcsid[] = "$NetBSD: w_lgamma.c,v 1.6 1995/05/10 20:49:24 jtc Exp $"; #include "math.h" #include "math_private.h" -extern int signgam; +extern int __signgam; #ifdef __STDC__ double __lgamma(double x) @@ -33,10 +33,10 @@ extern int signgam; #endif { #ifdef _IEEE_LIBM - return __ieee754_lgamma_r(x,&signgam); + return __ieee754_lgamma_r(x,&__signgam); #else double y; - y = __ieee754_lgamma_r(x,&signgam); + y = __ieee754_lgamma_r(x,&__signgam); if(_LIB_VERSION == _IEEE_) return y; if(!__finite(y)&&__finite(x)) { if(__floor(x)==x&&x<=0.0) diff --git a/sysdeps/libm-ieee754/w_lgammaf.c b/sysdeps/libm-ieee754/w_lgammaf.c index 1fd15a3110..e05660284f 100644 --- a/sysdeps/libm-ieee754/w_lgammaf.c +++ b/sysdeps/libm-ieee754/w_lgammaf.c @@ -8,7 +8,7 @@ * * Developed at SunPro, a Sun Microsystems, Inc. business. * Permission to use, copy, modify, and distribute this - * software is freely granted, provided that this notice + * software is freely granted, provided that this notice * is preserved. * ==================================================== */ @@ -20,7 +20,7 @@ static char rcsid[] = "$NetBSD: w_lgammaf.c,v 1.3 1995/05/10 20:49:30 jtc Exp $" #include "math.h" #include "math_private.h" -extern int signgam; +extern int __signgam; #ifdef __STDC__ float __lgammaf(float x) @@ -30,10 +30,10 @@ extern int signgam; #endif { #ifdef _IEEE_LIBM - return __ieee754_lgammaf_r(x,&signgam); + return __ieee754_lgammaf_r(x,&__signgam); #else float y; - y = __ieee754_lgammaf_r(x,&signgam); + y = __ieee754_lgammaf_r(x,&__signgam); if(_LIB_VERSION == _IEEE_) return y; if(!__finitef(y)&&__finitef(x)) { if(__floorf(x)==x&&x<=(float)0.0) @@ -45,5 +45,5 @@ extern int signgam; } else return y; #endif -} +} weak_alias (__lgammaf, lgammaf) diff --git a/sysdeps/libm-ieee754/w_lgammal.c b/sysdeps/libm-ieee754/w_lgammal.c index 3d2cdbbc30..aab8417e31 100644 --- a/sysdeps/libm-ieee754/w_lgammal.c +++ b/sysdeps/libm-ieee754/w_lgammal.c @@ -27,7 +27,7 @@ static char rcsid[] = "$NetBSD: $"; #include "math.h" #include "math_private.h" -extern int signgam; +extern int __signgam; #ifdef __STDC__ long double __lgammal(long double x) @@ -37,10 +37,10 @@ extern int signgam; #endif { #ifdef _IEEE_LIBM - return __ieee754_lgammal_r(x,&signgam); + return __ieee754_lgammal_r(x,&__signgam); #else long double y; - y = __ieee754_lgammal_r(x,&signgam); + y = __ieee754_lgammal_r(x,&__signgam); if(_LIB_VERSION == _IEEE_) return y; if(!__finitel(y)&&__finitel(x)) { if(__floorl(x)==x&&x<=0.0) diff --git a/sysdeps/unix/sysv/linux/bits/sockunion.h b/sysdeps/unix/sysv/linux/bits/sockunion.h index b66ac41f23..1645e6e87d 100644 --- a/sysdeps/unix/sysv/linux/bits/sockunion.h +++ b/sysdeps/unix/sysv/linux/bits/sockunion.h @@ -18,7 +18,7 @@ Boston, MA 02111-1307, USA. */ #ifndef _SYS_SOCKET_H -# error "Never include directly; use instead." +# error "Never include directly; use instead." #endif #include