update from main archive 961201 cvs/libc-961202

Mon Dec  2 03:59:38 1996  Ulrich Drepper  <drepper@cygnus.com>

	* grp/initgroups.c: Update and reformat copyright.
	Use __getgrent_r instead of getgrent.

	* inet/rcmd.c: Update and reformat copyright.
	Use __gethostbyname_r instead of gethostbyname.
	* inet/rexec.c: Likewise.

	* intl/finddomain.c: Correct comment about CEN sponsor and revision.
	* locale/findlocale.c: Likewise.
	* intl/l10nflist.c: Correct handling of CEN sponsor and revision.
	* locale/Makefile (CPPFLAGS): Add definition of LOCALEDIR.
	* locale/setlocale.c (setlocale): Correctly split value of
	LOCALE_PATH.
	* locale/programs/localedef.c: Use LOCALEDIR not LOCALE_PATH to
	find output directory.

	* nss/getXXbyYY.c [NEED_H_ERRNO]: Before enlarging buffer test
	h_errno_tmp variable.
	Save error value from being changed during `free' call.
	* nss/getXXent.c: Likewise.

	* nss/nss_files/files-XXX.c: Set h_errno variable to NETDB_INTERNAL
	before returning ERANGE error.

	* posix/glob.c: Use getlogin_r and getpwnam_r function when available
	or in GNU libc.

	* pwd/getpw.c: Use getpwuid_r instead of getpwuid.

	* sunrpc/clnt_gen.c: Use gethostbyname_r and getprotobyname_r.
	* sunrpc/clnt_simp.c: Likewise.
	* sunrpc/getrpcport.c: Likewise.
	* sysdeps/unix/sysv/linux/gethostid.c: Likewise.

	* posix/getconf.c: Treat _SC_UNIT_MAX and _SC_ULONG_MAX separately
	since the value might be outsode the range of the `long int'.
	Print string `undefined' when a value is undefined.

	* stdlib/l64a.c: Return correct pointer.
	Patch by NIIBE Yutaka <gniibe@mri.co.jp>.

	* string/Makefile (routines): Add argz-addsep.
	* string/argz-addsep.c: New file.
	* string/argz.h: Add prototypes for argz_add_sep.

	* string/argz-ctsep.c: Prevent memory leak.

	* string/strcoll.c: Correct typo in comment.

Sat Nov 30 02:53:59 1996  Ulrich Drepper  <drepper@cygnus.com>

	* sysdeps/unix/sysv/linux/sys/serial.h: Removed again.  The file is
	not general enough to be part of the libc.
	* sysdeps/unix/sysv/linux/Dist: Remove sys/serial.h.
	* sysdeps/unix/sysv/linux/Makefile: Don't install sys/serial.h.

Thu Nov 28 20:04:41 1996  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>

	* login/Makefile: Fix typo.

	* nss/Makefile (generated): Filter out db-alias.c.

Thu Nov 28 14:44:01 1996  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>

	* time/Makefile (echo-zonenames): Don't depend on non-existing
	target `zonenames'.

Thu Nov 28 12:34:05 1996  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>

	* link.h: New file.
	* nss/nsswitch.c: Use it.

	* printf.h: Fix file name.
	* stdlib/strfmon.c: Use it.

4 files changed, 35 insertions, 133 deletions

diff --git a/sysdeps/unix/sysv/linux/Dist b/sysdeps/unix/sysv/linux/Dist
index 3f7d1235e5..0adc370632 100644
--- a/sysdeps/unix/sysv/linux/Dist
+++ b/sysdeps/unix/sysv/linux/Dist
@@ -21,7 +21,6 @@ sys/mount.h
 sys/mtio.h
 sys/procfs.h
 sys/quota.h
-sys/serial.h
 sys/socketcall.h
 sys/soundcard.h
 sys/sysctl.h
diff --git a/sysdeps/unix/sysv/linux/Makefile b/sysdeps/unix/sysv/linux/Makefile
index 9e6bd65bd1..c7cf1f9570 100644
--- a/sysdeps/unix/sysv/linux/Makefile
+++ b/sysdeps/unix/sysv/linux/Makefile
@@ -10,8 +10,7 @@ sysdep_routines += sysctl clone llseek
 sysdep_headers += sys/mount.h sys/acct.h sys/sysctl.h sys/mtio.h \
 		  sys/module.h sys/io.h sys/klog.h sys/kdaemon.h \
 		  sys/user.h syscall-list.h sys/sysmacros.h sys/procfs.h \
-		  sys/debugreg.h sys/kd.h sys/soundcard.h sys/vt.h \
-		  sys/serial.h
+		  sys/debugreg.h sys/kd.h sys/soundcard.h sys/vt.h
 
 # Generate the list of SYS_* macros for the system calls (__NR_* macros).
 $(objpfx)syscall-%.h $(objpfx)syscall-%.d: ../sysdeps/unix/sysv/linux/syscall.h
diff --git a/sysdeps/unix/sysv/linux/gethostid.c b/sysdeps/unix/sysv/linux/gethostid.c
index ca2669d3e6..b313ab3409 100644
--- a/sysdeps/unix/sysv/linux/gethostid.c
+++ b/sysdeps/unix/sysv/linux/gethostid.c
@@ -1,20 +1,21 @@
 /* Copyright (C) 1995, 1996 Free Software Foundation, Inc.
 
-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.
-
-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.  */
-
+   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.
+
+   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.  */
+
+#include <alloca.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <unistd.h>
@@ -58,9 +59,12 @@ long int
 gethostid ()
 {
   char hostname[MAXHOSTNAMELEN + 1];
-  struct hostent *hp;
-  unsigned long id;
+  size_t buflen;
+  char *buffer;
+  struct hostent hostbuf, *hp;
+  unsigned long int id;
   struct in_addr in;
+  int herr;
   int fd;
 
   /* First try to get the ID from a former invocation of sethostid.  */
@@ -81,10 +85,20 @@ gethostid ()
     /* This also fails.  Return and arbitrary value.  */
     return 0;
 
+  buflen = 1024;
+  buffer = __alloca (buflen);
+
   /* To get the IP address we need to know the host name.  */
-  hp = gethostbyname (hostname);
-  if (hp == NULL)
-    return 0;
+  while (__gethostbyname_r (hostname, &hostbuf, buffer, buflen, &hp, &herr)
+	 < 0)
+    if (herr != NETDB_INTERNAL || errno != ERANGE)
+      return 0;
+    else
+      {
+	/* Enlarge buffer.  */
+	buflen *= 2;
+	buffer = __alloca (buflen);
+      }
 
   in.s_addr = 0;
   memcpy (&in, hp->h_addr,
diff --git a/sysdeps/unix/sysv/linux/sys/serial.h b/sysdeps/unix/sysv/linux/sys/serial.h
deleted file mode 100644
index 1844ef6032..0000000000
--- a/sysdeps/unix/sysv/linux/sys/serial.h
+++ /dev/null
@@ -1,110 +0,0 @@
-/* Copyright (C) 1996 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 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., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
-
-#ifndef _SYS_SERIAL_H
-#define _SYS_SERIAL_H	1
-/* Defines for PC AT serial port.  */
-
-/* Serial port addresses and IRQs.  */
-#define PORT_0		0x03F8
-#define PORT_1		0x02F8
-#define IRQ_0		0x04
-#define IRQ_1		0x03
-
-/* Definitions for INS8250 / 16550 chips.  */
-
-/* Defined as offsets from the port address (data port).  */
-#define DAT	0	/* Receive/transmit data.  */
-#define ICR	1	/* Interrupt control register.  */
-#define ISR	2	/* Interrupt status register.  */
-#define LCR	3	/* Line control register.  */
-#define MCR	4	/* Modem control register.  */
-#define LSR	5	/* Line status register.  */
-#define MSR	6	/* Modem status register.  */
-#define DLL	0	/* Divisor latch (lsb).  */
-#define DLH	1	/* Divisor latch (msb).  */
-
-
-/* ICR.  */
-#define RIEN	0x01	/* Enable receiver interrupt.  */
-#define TIEN	0x02	/* Enable transmitter interrupt.  */
-#define SIEN	0x04	/* Enable receiver line status interrupt.  */
-#define MIEN	0x08	/* Enable modem status interrupt.  */
-
-
-/* ISR */
-#define FFTMOUT	0x0c	/* Fifo rcvr timeout.  */
-#define RSTATUS	0x06	/* Change in receiver line status.  */
-#define RxRDY	0x04	/* Receiver data available.  */
-#define TxRDY	0x02	/* Transmitter holding register empty.  */
-#define MSTATUS	0x00	/* Change in modem status.  */
-
-
-/* LCR 3
-   Number of data bits per received/transmitted character.  */
-#define RXLEN	0x03
-#define STOP1	0x00
-#define STOP2	0x04
-#define PAREN	0x08
-#define PAREVN	0x10
-#define PARMARK	0x20
-#define SNDBRK	0x40
-#define DLAB	0x80
-
-/* Baud rate definitions.  */
-#define ASY9600	12
-
-/* Definitions for character length (data bits) in RXLEN field.  */
-#define BITS5	0x00
-#define BITS6	0x01
-#define BITS7	0x02
-#define BITS8	0x03
-
-/* MCR.  */
-#define DTR	0x01	/* Bring up DTR.  */
-#define RTS	0x02	/* Bring up RTS.  */
-#define OUT1	0x04
-#define OUT2	0x08
-#define LOOP	0x10	/* Put chip into loopback state.  */
-
-
-/* LSR */
-#define RCA	0x01	/* Receive char available.  */
-#define OVRRUN	0x02	/* Receive overrun.  */
-#define PARERR	0x04	/* Parity error.  */
-#define FRMERR	0x08	/* Framing/CRC error.  */
-#define BRKDET	0x10	/* Break detected (null char + frame error).  */
-#define XHRE	0x20	/* Transmit holding register empty.  */
-#define XSRE	0x40	/* Transmit shift register empty.  */
-
-
-/* MSR */
-#define DCTS	0x01	/* CTS has changed state.  */
-#define DDSR	0x02	/* DSR has changed state.  */
-#define DRI	0x04	/* RI has changed state.  */
-#define DDCD	0x08    /* DCD has changed state.  */
-#define CTS	0x10	/* State of CTS.  */
-#define DSR	0x20	/* State of DSR.  */
-#define RI      0x40    /* State of RI.  */
-#define DCD     0x80    /* State of DCD.  */
-
-
-#define DELTAS(x)	((x) & (DCTS | DDSR | DRI | DDCD))
-#define STATES(x)	((x) (CTS | DSR | RI | DCD))
-
-#endif /* sys/serial.h */