Update.

1998-04-07  Andreas Jaeger  <aj@arthur.rhein-neckar.de>

	* sysdeps/unix/sysv/linux/bits/sockunion.h: Fix error message.

	* manual/socket.texi (Interface Naming): Fix typo.

1998-04-07  Andreas Jaeger  <aj@arthur.rhein-neckar.de>

	* 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  <drepper@cygnus.com>

	* 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.

4 files changed, 19 insertions, 18 deletions

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