update from main archive 970124cvs/libc-970125

Sat Jan 25 02:05:19 1997  Eirik Fuller  <eirik@netcom.com>

	* sysdeps/unix/sysv/linux/alpha/ioperm.c: Rename T2_SPARSE_BASE and
	T2_DENSE_BASE to T2_SPARSE_MEM and T2_DENSE_MEM resp.

Thu Jan 23 11:13:46 1997  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>

	* sysdeps/unix/sysv/linux/usleep.c: Normalize the time
	specification.

Fri Jan 24 14:33:45 1997  Ulrich Drepper  <drepper@cygnus.com>

	* sysdeps/generic/socketbits.h: Also make SOCK_* constants available
	as macros so that #ifdef works.
	* sysdeps/unix/sysv/linux/socketbits.h: Likewise.

1997-01-23  Paul Eggert  <eggert@twinsun.com>

	* login/utmp_db.c, manual/time.texi, shlib-versions, sunrpc/rpc/svc.h,
	sunrpc/rpcsvc/sm_inter.x, sysdeps/generic/abort.c,
	sysdeps/libm-ieee754/e_sinhl.c, sysdeps/unix/sysv/linux/net/route.h,
	sysdeps/unix/sysv/linux/sparc/__sigtrampoline.S: Spell fixes.

18 files changed, 92 insertions, 46 deletions

diff --git a/ChangeLog b/ChangeLog
index c19819349b..1e47cf9bb4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,26 @@
+Sat Jan 25 02:05:19 1997  Eirik Fuller  <eirik@netcom.com>
+
+	* sysdeps/unix/sysv/linux/alpha/ioperm.c: Rename T2_SPARSE_BASE and
+	T2_DENSE_BASE to T2_SPARSE_MEM and T2_DENSE_MEM resp.
+
+Thu Jan 23 11:13:46 1997  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>
+
+	* sysdeps/unix/sysv/linux/usleep.c: Normalize the time
+	specification.
+
+Fri Jan 24 14:33:45 1997  Ulrich Drepper  <drepper@cygnus.com>
+
+	* sysdeps/generic/socketbits.h: Also make SOCK_* constants available
+	as macros so that #ifdef works.
+	* sysdeps/unix/sysv/linux/socketbits.h: Likewise.
+
+1997-01-23  Paul Eggert  <eggert@twinsun.com>
+
+	* login/utmp_db.c, manual/time.texi, shlib-versions, sunrpc/rpc/svc.h,
+	sunrpc/rpcsvc/sm_inter.x, sysdeps/generic/abort.c,
+	sysdeps/libm-ieee754/e_sinhl.c, sysdeps/unix/sysv/linux/net/route.h,
+	sysdeps/unix/sysv/linux/sparc/__sigtrampoline.S: Spell fixes.
+
 1997-01-23  Paul Eggert  <eggert@twinsun.com>
 
 	* mktime.c (mktime): Invoke __tzset, not __tzset_internal, to set tz,
diff --git a/README.template b/README.template
index 4e983a1718..811926c47b 100644
--- a/README.template
+++ b/README.template
@@ -6,9 +6,9 @@ As of this release, the GNU C library is known to run on the following
 configurations:
 
 		*-*-gnu			GNU Hurd
-		i[3456]86-*-linux	Linux-2.0 on Intel
-		m68k-*-linux		Linux-2.0 on Motorola 680x0
-		alpha-*-linux		Linux-2.0 on DEC Alpha
+		i[3456]86-*-linux-gnu	Linux-2.0 on Intel
+		m68k-*-linux-gnu	Linux-2.0 on Motorola 680x0
+		alpha-*-linux-gnu	Linux-2.0 on DEC Alpha
 
 
 Former releases of this library (version 1.09.1 and perhaps earlier
@@ -39,38 +39,50 @@ versions) used to run on the following configurations:
 Whether this is still true for this release is unknown.  Porting the
 library is not hard.  If you are interested in doing a port, please
 get on the mailing list by sending electronic mail to
-bug-glibc-request@prep.ai.mit.edu.
+<bug-glibc-request@prep.ai.mit.edu>.
 
 The GNU C library now includes Michael Glad's Ultra Fast Crypt, which
 provides the Unix `crypt' function, plus some other entry points.
 Because of the United States export restriction on DES implementations,
 we are distributing this code separately from the rest of the C
 library.  There is an extra distribution tar file just for crypt; it is
-called `glibc-VERSION-crypt.tar.gz'.  You can just unpack the crypt
+called `glibc-crypt-VERSION.tar.gz'.  You can just unpack the crypt
 distribution along with the rest of the C library and build; you can
 also build the library without getting crypt.  Users outside the USA
-can get the crypt distribution via anonymous FTP from ftp.uni-c.dk
-[129.142.6.74], or another archive site outside the USA.  Archive
+can get the crypt distribution via anonymous FTP from ftp.ifi.uio.no
+[129.240.64.21], or another archive site outside the USA.  Archive
 maintainers are encouraged to copy this distribution to their archives
-outside the USA.  Please get it from ftp.uni-c.dk; transferring this
+outside the USA.  Please get it from ftp.ifi.uio.no; transferring this
 distribution from prep.ai.mit.edu (or any other site in the USA) to a
 site outside the USA is in violation of US export laws.
 
+Beside the separate crypt tar file there are some more add-ons which can be
+used together with GNU libc.  They are designed in a way to ease the
+installation by integrating them in the libc source tree.  Simply get the
+add-ons you need and use the --enable-add-ons option of the `configure'
+script to tell where the add-ons are found.  Please read the FAQ file for
+more details.
+
 See the file INSTALL to find out how to configure, build, install, and port
-the GNU C library.
+the GNU C library.  You might also consider reading the WWW pages for the
+GNU libc at http://www.gnu.org/software/libc/libc.html.
 
 The GNU C Library is completely documented by the Texinfo manual found
 in the `manual/' subdirectory.  The manual is still being updated and
 contains some known errors and omissions; we regret that we do not have
 the resources to work on the manual as much as we would like.  Please
-send comments on the manual to bug-glibc-manual@prep.ai.mit.edu, and
+send comments on the manual to <bug-glibc-manual@prep.ai.mit.edu>, and
 not to the library bug-reporting address.
 
 The file NOTES contains a description of the feature-test macros used
 in the GNU C library, explaining how you can tell the library what
 facilities you want it to make available.
 
-Send bug reports to bug-glibc@prep.ai.mit.edu.
+We prefer to get bug reports sent using the `glibcbug' shell script which
+is install together with the rest of the GNU libc to <bugs@gnu.ai.mit.edu>.
+Simply run this shell script and fill in the information.  Nevertheless
+you can still send bug reports to <bug-glibc@prep.ai.mit.edu> as normal
+electronic mails.
 
 The GNU C Library is free software.  See the file COPYING.LIB for copying
 conditions.
diff --git a/login/utmp_db.c b/login/utmp_db.c
index 70ed161f59..fa0e29a52e 100644
--- a/login/utmp_db.c
+++ b/login/utmp_db.c
@@ -38,7 +38,7 @@ static const char *file_name = (const char *) default_file_name;
 
 /* Descriptor for database.  */
 #if 0
-/* XXX One day this will become menaingful again.  */
+/* XXX One day this will become meaningful again.  */
 static DB *db_fd;
 static char last_date[16];
 #endif
diff --git a/manual/time.texi b/manual/time.texi
index 1214be23d4..d0b0e0a111 100644
--- a/manual/time.texi
+++ b/manual/time.texi
@@ -654,7 +654,7 @@ padded, since there is no natural width for them.
 
 Following the flag an optional specification of the width is possible.
 This is specified in decimal notation.  If the natural size of the
-output is of the field has less than the specifed number of character,
+output is of the field has less than the specified number of characters,
 the result is written right adjusted and space padded to the given
 size.
 
diff --git a/shlib-versions b/shlib-versions
index f966662938..75d94b12fb 100644
--- a/shlib-versions
+++ b/shlib-versions
@@ -61,5 +61,5 @@ i.86-.*-linux.*		ld=ld-linux.so.2
 # This defines the shared library version numbers we will install.
 .*-.*-.*		libcrypt=1
 
-# The gross patch for programs assuming broken locale implemenations.
+# The gross patch for programs assuming broken locale implementations.
 .*-.*-.*		libBrokenLocale=1
diff --git a/sunrpc/rpc/svc.h b/sunrpc/rpc/svc.h
index 3fee9ee394..ff7738752f 100644
--- a/sunrpc/rpc/svc.h
+++ b/sunrpc/rpc/svc.h
@@ -236,7 +236,7 @@ extern void	svcerr_systemerr __P ((SVCXPRT *__xprt));
  * Somebody has to wait for incoming requests and then call the correct
  * service routine.  The routine svc_run does infinite waiting; i.e.,
  * svc_run never returns.
- * Since another (coexistant) package may wish to selectively wait for
+ * Since another (coexistent) package may wish to selectively wait for
  * incoming calls or other events outside of the rpc architecture, the
  * routine svc_getreq is provided.  It must be passed readfds, the
  * "in-place" results of a select system call (see select, section 2).
diff --git a/sunrpc/rpcsvc/sm_inter.x b/sunrpc/rpcsvc/sm_inter.x
index 06c8f06e30..9cbb7011a6 100644
--- a/sunrpc/rpcsvc/sm_inter.x
+++ b/sunrpc/rpcsvc/sm_inter.x
@@ -67,7 +67,7 @@ struct sm_name {
 };
 
 struct my_id {
-	string	 my_name<SM_MAXSTRLEN>;		/* name of the site iniating the monitoring request*/
+	string	 my_name<SM_MAXSTRLEN>;		/* name of the site initiating the monitoring request*/
 	int	my_prog;			/* rpc program # of the requesting process */
 	int	my_vers;			/* rpc version # of the requesting process */
 	int	my_proc;			/* rpc procedure # of the requesting process */
diff --git a/sysdeps/generic/abort.c b/sysdeps/generic/abort.c
index 14c182b411..c1969f4d1f 100644
--- a/sysdeps/generic/abort.c
+++ b/sysdeps/generic/abort.c
@@ -74,7 +74,7 @@ abort (void)
       /* This stage is special: we must allow repeated calls of
 	 `abort' when a user defined handler for SIGABRT is installed.
 	 This is risky since the `raise' implementation might also
-	 fail but I don't see another possiblity.  */
+	 fail but I don't see another possibility.  */
       int save_stage = stage;
 
       stage = 0;
diff --git a/sysdeps/generic/socketbits.h b/sysdeps/generic/socketbits.h
index 770f011ffb..db1a0ac7ee 100644
--- a/sysdeps/generic/socketbits.h
+++ b/sysdeps/generic/socketbits.h
@@ -1,21 +1,21 @@
 /* System-specific socket constants and types.  Generic/4.3 BSD version.
-Copyright (C) 1991, 92, 94, 95, 96 Free Software Foundation, Inc.
-This file is part of the GNU C Library.
+   Copyright (C) 1991, 92, 94, 95, 96, 97 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
 
-The GNU C Library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Library General Public License as
-published by the Free Software Foundation; either version 2 of the
-License, or (at your option) any later version.
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 of the
+   License, or (at your option) any later version.
 
-The GNU C Library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-Library General Public License for more details.
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
 
-You should have received a copy of the GNU Library General Public
-License along with the GNU C Library; see the file COPYING.LIB.  If
-not, write to the Free Software Foundation, Inc., 675 Mass Ave,
-Cambridge, MA 02139, USA.  */
+   You should have received a copy of the GNU Library General Public
+   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */
 
 #ifndef	_SOCKETBITS_H
 
@@ -33,12 +33,17 @@ enum __socket_type
 {
   SOCK_STREAM = 1,		/* Sequenced, reliable, connection-based
 				   byte streams.  */
+#define SOCK_STREAM SOCK_STREAM
   SOCK_DGRAM = 2,		/* Connectionless, unreliable datagrams
 				   of fixed maximum length.  */
+#define SOCK_DGRAM SOCK_DGRAM
   SOCK_RAW = 3,			/* Raw protocol interface.  */
+#define SOCK_RAW SOCK_RAW
   SOCK_RDM = 4,			/* Reliably-delivered messages.  */
+#define SOCK_RDM SOCK_RDM
   SOCK_SEQPACKET = 5,		/* Sequenced, reliable, connection-based,
 				   datagrams of fixed maximum length.  */
+#define SOCK_SEQPACKET SOCK_SEQPACKET
 };
 
 /* Protocol families.  */
diff --git a/sysdeps/libm-ieee754/e_sinhl.c b/sysdeps/libm-ieee754/e_sinhl.c
index 2d98562f94..f9ccc6fa90 100644
--- a/sysdeps/libm-ieee754/e_sinhl.c
+++ b/sysdeps/libm-ieee754/e_sinhl.c
@@ -77,7 +77,7 @@ static long double one = 1.0, shuge = 1.0e4931L;
 	if (ix < 0x400c || (ix == 0x400c && i0 < 0xb17217f7))
 		return h*__ieee754_expl(fabsl(x));
 
-    /* |x| in [log(maxdouble), overflowthresold] */
+    /* |x| in [log(maxdouble), overflowthreshold] */
 	if (ix<0x400c || (ix == 0x400c && (i0 < 0xb174ddc0
 					   || (i0 == 0xb174ddc0
 					       && i1 <= 0x31aec0ea)))) {
@@ -86,6 +86,6 @@ static long double one = 1.0, shuge = 1.0e4931L;
 	    return t*w;
 	}
 
-    /* |x| > overflowthresold, sinhl(x) overflow */
+    /* |x| > overflowthreshold, sinhl(x) overflow */
 	return x*shuge;
 }
diff --git a/sysdeps/mach/hurd/vdprintf.c b/sysdeps/mach/hurd/vdprintf.c
index e14c295f3e..bf70de69a3 100644
--- a/sysdeps/mach/hurd/vdprintf.c
+++ b/sysdeps/mach/hurd/vdprintf.c
@@ -33,7 +33,7 @@ vdprintf (int d, const char *format, va_list arg)
   struct hurd_fd *fd;
 
   HURD_CRITICAL_BEGIN;
-  fd = _hurd_fd_get (fd);
+  fd = _hurd_fd_get (d);
   HURD_CRITICAL_END;
 
   if (!fd)
diff --git a/sysdeps/unix/sysv/linux/alpha/ioperm.c b/sysdeps/unix/sysv/linux/alpha/ioperm.c
index 488265a069..b39f39a0d7 100644
--- a/sysdeps/unix/sysv/linux/alpha/ioperm.c
+++ b/sysdeps/unix/sysv/linux/alpha/ioperm.c
@@ -67,8 +67,8 @@
 #define CIA_DENSE_MEM		(0xfffffc8600000000UL)
 
 #define T2_IO_BASE		(0xfffffc03a0000000UL)
-#define T2_SPARSE_BASE		(0xfffffc0200000000UL)
-#define T2_DENSE_BASE		(0xfffffc03c0000000UL)
+#define T2_SPARSE_MEM		(0xfffffc0200000000UL)
+#define T2_DENSE_MEM		(0xfffffc03c0000000UL)
 
 typedef enum {
   IOSYS_UNKNOWN, IOSYS_JENSEN, IOSYS_APECS, IOSYS_CIA, IOSYS_T2
diff --git a/sysdeps/unix/sysv/linux/net/route.h b/sysdeps/unix/sysv/linux/net/route.h
index 531b069d12..d60a3cabb5 100644
--- a/sysdeps/unix/sysv/linux/net/route.h
+++ b/sysdeps/unix/sysv/linux/net/route.h
@@ -77,7 +77,7 @@ struct rtentry
 #define RTF_NEXTHOP	0x8000		/* Non gateway route with nexthop.  */
 
 
-#define RTF_MAGIC	0x10000		/* Route added/deleted authomatically,
+#define RTF_MAGIC	0x10000		/* Route added/deleted automatically,
 					   when interface changes its state. */
 
 #define RTCF_VALVE	0x00200000
diff --git a/sysdeps/unix/sysv/linux/socketbits.h b/sysdeps/unix/sysv/linux/socketbits.h
index 3bb92ab733..e9c88758e5 100644
--- a/sysdeps/unix/sysv/linux/socketbits.h
+++ b/sysdeps/unix/sysv/linux/socketbits.h
@@ -33,15 +33,21 @@ enum __socket_type
 {
   SOCK_STREAM = 1,		/* Sequenced, reliable, connection-based
 				   byte streams.  */
+#define SOCK_STREAM SOCK_STREAM
   SOCK_DGRAM = 2,		/* Connectionless, unreliable datagrams
 				   of fixed maximum length.  */
+#define SOCK_DGRAM SOCK_DGRAM
   SOCK_RAW = 3,			/* Raw protocol interface.  */
+#define SOCK_RAW SOCK_RAW
   SOCK_RDM = 4,			/* Reliably-delivered messages.  */
+#define SOCK_RDM SOCK_RDM
   SOCK_SEQPACKET = 5,		/* Sequenced, reliable, connection-based,
 				   datagrams of fixed maximum length.  */
+#define SOCK_SEQPACKET SOCK_SEQPACKET
   SOCK_PACKET = 10		/* Linux specific way of getting packets
 				   at the dev level.  For writing rarp and
 				   other similar things on the user level. */
+#define SOCK_PACKET SOCK_PACKET
 };
 
 /* Protocol families.  */
diff --git a/sysdeps/unix/sysv/linux/sparc/__sigtrampoline.S b/sysdeps/unix/sysv/linux/sparc/__sigtrampoline.S
index d0fe760270..4fea850ee3 100644
--- a/sysdeps/unix/sysv/linux/sparc/__sigtrampoline.S
+++ b/sysdeps/unix/sysv/linux/sparc/__sigtrampoline.S
@@ -99,7 +99,7 @@ ___syy:
 	ld	[%fp + REGWIN_SZ + 4],%o1         /* Load subcode */
 	ld      [%fp + REGWIN_SZ + 8],%o2         /* pointer to sigcontext */
 	call	%o4
-	ld      [%fp + REGWIN_SZ + 12],%o3        /* Address where signal ocurred */
+	ld      [%fp + REGWIN_SZ + 12],%o3        /* Address where signal occurred */
 
 	/* handler returned, restore state */
 	tst	%l0
diff --git a/sysdeps/unix/sysv/linux/sparc/socket.S b/sysdeps/unix/sysv/linux/sparc/socket.S
index f8075201db..24aba3fc74 100644
--- a/sysdeps/unix/sysv/linux/sparc/socket.S
+++ b/sysdeps/unix/sysv/linux/sparc/socket.S
@@ -24,7 +24,7 @@
 #define P2(a, b) a##b
 
 	.text
-/* The socket-oriented system calls are handled unusally in Linux.
+/* The socket-oriented system calls are handled unusually in Linux.
    They are all gated through the single `socketcall' system call number.
    `socketcall' takes two arguments: the first is the subcode, specifying
    which socket function is being called; and the second is a pointer to
diff --git a/sysdeps/unix/sysv/linux/usleep.c b/sysdeps/unix/sysv/linux/usleep.c
index 9d36a90008..9265897053 100644
--- a/sysdeps/unix/sysv/linux/usleep.c
+++ b/sysdeps/unix/sysv/linux/usleep.c
@@ -1,5 +1,5 @@
 /* Implementation of the BSD usleep function using nanosleep.
-   Copyright (C) 1996 Free Software Foundation, Inc.
+   Copyright (C) 1996, 1997 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996.
 
@@ -24,8 +24,8 @@
 void
 usleep (unsigned int useconds)
 {
-  struct timespec ts = { tv_sec: 0,
-			 tv_nsec: (long int) useconds * 1000ul };
+  struct timespec ts = { tv_sec: (long int) (useconds / 1000000),
+			 tv_nsec: (long int) (useconds % 1000000) * 1000ul };
 
   __nanosleep (&ts, NULL);
 }
diff --git a/time/README b/time/README
index 3bd4e306ed..99d14db152 100644
--- a/time/README
+++ b/time/README
@@ -1,11 +1,11 @@
-The sources files
+The source files
 	`zic.c'
 	`zdump.c'
 	`tzselect.ksh'
 	`checktab.awk'
-files come from the tzcode1997a package by Arthur David Olsen et.al.
+come from the tzcode1997a package by Arthur David Olsen et.al.
 
-The file
+The files
 	`africa'
 	`antarctica'
 	`asia'
@@ -25,4 +25,4 @@ The file
 	`zone.tab'
 	`leapseconds'
 	`yearistype'
-files come from the tzdata1997a package by Arthur David Olsen et.al.
+come from the tzdata1997a package by Arthur David Olsen et.al.