merge with 1.10n2

5 files changed, 77 insertions, 137 deletions

diff --git a/lib/group-member.c b/lib/group-member.c
index f9bb8fcd4..05b1bc0d7 100644
--- a/lib/group-member.c
+++ b/lib/group-member.c
@@ -16,14 +16,7 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 #ifdef HAVE_CONFIG_H
-#if defined (CONFIG_BROKETS)
-/* We use <config.h> instead of "config.h" so that a compilation
-   using -I. -I$srcdir will use ./config.h rather than $srcdir/config.h
-   (which it would do because it found this file in $srcdir).  */
 #include <config.h>
-#else
-#include "config.h"
-#endif
 #endif
 
 #include <stdio.h>
diff --git a/lib/mktime.c b/lib/mktime.c
index 74167e528..b80c5064c 100644
--- a/lib/mktime.c
+++ b/lib/mktime.c
@@ -3,36 +3,30 @@
    Michael E. Calwas (calwas@ttd.teradyne.com) and
    Wade Hampton (tasi029@tmn.com).
 
-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.
+NOTE: The canonical source of this file is maintained with the GNU C Library.
+Bugs can be reported to bug-glibc@prep.ai.mit.edu.
 
-The GNU C Library is distributed in the hope that it will be useful,
+This program is free software; you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation; either version 2, or (at your option) any
+later version.
+
+This program 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.
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU 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 General Public License
+along with this program; if not, write to the Free Software
+Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 /* Define this to have a standalone program to test this implementation of
    mktime.  */
 /* #define DEBUG */
 
 #ifdef HAVE_CONFIG_H
-#if defined (CONFIG_BROKETS)
-/* We use <config.h> instead of "config.h" so that a compilation
-   using -I. -I$srcdir will use ./config.h rather than $srcdir/config.h
-   (which it would do because it found this file in $srcdir).  */
 #include <config.h>
-#else
-#include "config.h"
-#endif
 #endif
 
 #include <sys/types.h>		/* Some systems define `time_t' here.  */
diff --git a/lib/putenv.c b/lib/putenv.c
index 06e3254b6..9ba55a70f 100644
--- a/lib/putenv.c
+++ b/lib/putenv.c
@@ -1,76 +1,46 @@
 /* Copyright (C) 1991 Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
+NOTE: The canonical source of this file is maintained with the GNU C Library.
+Bugs can be reported to bug-glibc@prep.ai.mit.edu.
 
-   This program 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 General Public License for more details.
+This program is free software; you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation; either version 2, or (at your option) any
+later version.
 
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
+This program 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 General Public License for more details.
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
-#include <sys/types.h>
+#include <ansidecl.h>
 #include <errno.h>
-#ifndef errno
-extern int errno;
-#endif
-
-/* Don't include stdlib.h for non-GNU C libraries because some of them
-   contain conflicting prototypes for getopt.
-   This needs to come after some library #include
-   to get __GNU_LIBRARY__ defined.  */
-#ifdef	__GNU_LIBRARY__
 #include <stdlib.h>
-#else
-char *malloc ();
-#endif	/* GNU C library.  */
-
-#if defined(STDC_HEADERS) || defined(HAVE_STRING_H)
 #include <string.h>
-#else
-#include <strings.h>
-#ifndef strchr
-#define strchr index
-#endif
-#ifndef memcpy
-#define memcpy(d, s, n) bcopy((s), (d), (n))
-#endif
-#endif
-
-#ifdef HAVE_UNISTD_H
 #include <unistd.h>
-#endif
 
-#ifndef NULL
-#define NULL 0
+#ifndef	HAVE_GNU_LD
+#define	__environ	environ
 #endif
 
-extern char **environ;
-
 /* Put STRING, which is of the form "NAME=VALUE", in the environment.  */
 int
-putenv (string)
-     const char *string;
+DEFUN(putenv, (string), CONST char *string)
 {
-  char *name_end = strchr (string, '=');
+  CONST char *CONST name_end = strchr(string, '=');
   register size_t size;
   register char **ep;
 
   if (name_end == NULL)
     {
       /* Remove the variable from the environment.  */
-      size = strlen (string);
-      for (ep = environ; *ep != NULL; ++ep)
-	if (!strncmp (*ep, string, size) && (*ep)[size] == '=')
+      size = strlen(string);
+      for (ep = __environ; *ep != NULL; ++ep)
+	if (!strncmp(*ep, string, size) && (*ep)[size] == '=')
 	  {
 	    while (ep[1] != NULL)
 	      {
@@ -83,8 +53,8 @@ putenv (string)
     }
 
   size = 0;
-  for (ep = environ; *ep != NULL; ++ep)
-    if (!strncmp (*ep, string, name_end - string) &&
+  for (ep = __environ; *ep != NULL; ++ep)
+    if (!strncmp(*ep, string, name_end - string) &&
 	(*ep)[name_end - string] == '=')
       break;
     else
@@ -93,16 +63,16 @@ putenv (string)
   if (*ep == NULL)
     {
       static char **last_environ = NULL;
-      char **new_environ = (char **) malloc ((size + 2) * sizeof (char *));
+      char **new_environ = (char **) malloc((size + 2) * sizeof(char *));
       if (new_environ == NULL)
 	return -1;
-      memcpy ((char *) new_environ, (char *) environ, size * sizeof (char *));
+      (void) memcpy((PTR) new_environ, (PTR) __environ, size * sizeof(char *));
       new_environ[size] = (char *) string;
       new_environ[size + 1] = NULL;
       if (last_environ != NULL)
-	free ((char *) last_environ);
+	free((PTR) last_environ);
       last_environ = new_environ;
-      environ = new_environ;
+      __environ = new_environ;
     }
   else
     *ep = (char *) string;
diff --git a/lib/strtod.c b/lib/strtod.c
index 2f6b894cf..34b82232e 100644
--- a/lib/strtod.c
+++ b/lib/strtod.c
@@ -1,60 +1,46 @@
 /* Copyright (C) 1991, 1992 Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
+NOTE: The canonical source of this file is maintained with the GNU C Library.
+Bugs can be reported to bug-glibc@prep.ai.mit.edu.
 
-   This program 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 General Public License for more details.
+This program is free software; you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation; either version 2, or (at your option) any
+later version.
 
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
+This program 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 General Public License for more details.
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
+#include <ansidecl.h>
+#include <localeinfo.h>
 #include <errno.h>
-#include <ctype.h>
-#include <math.h>
-
-#ifdef HAVE_FLOAT_H
 #include <float.h>
-#else
-#define DBL_MAX 1.7976931348623159e+308
-#define DBL_MIN 2.2250738585072010e-308
-#endif
-
-#if STDC_HEADERS
+#include <ctype.h>
 #include <stdlib.h>
 #include <string.h>
-#else
-#define NULL 0
-extern int errno;
-#ifndef HUGE_VAL
-#define HUGE_VAL HUGE
-#endif
-#endif
+#include <math.h>
+
 
 /* Convert NPTR to a double.  If ENDPTR is not NULL, a pointer to the
    character after the last one used in the number is put in *ENDPTR.  */
 double
-strtod (nptr, endptr)
-     const char *nptr;
-     char **endptr;
+DEFUN(strtod, (nptr, endptr), CONST char *nptr AND char **endptr)
 {
-  register const char *s;
+  register CONST char *s;
   short int sign;
+  wchar_t decimal;	/* Decimal point character.  */
 
   /* The number so far.  */
   double num;
 
-  int got_dot;			/* Found a decimal point.  */
-  int got_digit;		/* Seen any digits.  */
+  int got_dot;		/* Found a decimal point.  */
+  int got_digit;	/* Seen any digits.  */
 
   /* The exponent of the number.  */
   long int exponent;
@@ -65,10 +51,14 @@ strtod (nptr, endptr)
       goto noconv;
     }
 
+  /* Figure out the decimal point character.  */
+  if (mbtowc(&decimal, _numeric_info->decimal_point, 1) <= 0)
+    decimal = (wchar_t) *_numeric_info->decimal_point;
+
   s = nptr;
 
   /* Eat whitespace.  */
-  while (isspace (*s))
+  while (isspace(*s))
     ++s;
 
   /* Get the sign.  */
@@ -104,7 +94,7 @@ strtod (nptr, endptr)
 	  if (got_dot)
 	    --exponent;
 	}
-      else if (!got_dot && *s == '.')
+      else if (!got_dot && (wchar_t) *s == decimal)
 	/* Record that we have found the decimal point.  */
 	got_dot = 1;
       else
@@ -115,7 +105,7 @@ strtod (nptr, endptr)
   if (!got_digit)
     goto noconv;
 
-  if (tolower (*s) == 'e')
+  if (tolower(*s) == 'e')
     {
       /* Get the exponent specified after the `e' or `E'.  */
       int save = errno;
@@ -124,7 +114,7 @@ strtod (nptr, endptr)
 
       errno = 0;
       ++s;
-      exp = strtol (s, &end, 10);
+      exp = strtol(s, &end, 10);
       if (errno == ERANGE)
 	{
 	  /* The exponent overflowed a `long int'.  It is probably a safe
@@ -157,32 +147,32 @@ strtod (nptr, endptr)
 
   if (exponent < 0)
     {
-      if (num < DBL_MIN * pow (10.0, (double) -exponent))
+      if (num < DBL_MIN * pow(10.0, (double) -exponent))
 	goto underflow;
     }
   else if (exponent > 0)
     {
-      if (num > DBL_MAX * pow (10.0, (double) -exponent))
+      if (num > DBL_MAX * pow(10.0, (double) -exponent))
 	goto overflow;
     }
 
-  num *= pow (10.0, (double) exponent);
+  num *= pow(10.0, (double) exponent);
 
   return num * sign;
 
-overflow:
+ overflow:
   /* Return an overflow error.  */
   errno = ERANGE;
   return HUGE_VAL * sign;
 
-underflow:
+ underflow:
   /* Return an underflow error.  */
   if (endptr != NULL)
     *endptr = (char *) nptr;
   errno = ERANGE;
   return 0.0;
 
-noconv:
+ noconv:
   /* There was no number.  */
   if (endptr != NULL)
     *endptr = (char *) nptr;
diff --git a/lib/xgethostname.c b/lib/xgethostname.c
index 9973b45be..216e78be4 100644
--- a/lib/xgethostname.c
+++ b/lib/xgethostname.c
@@ -18,14 +18,7 @@
 /* Written by Jim Meyering, meyering@comco.com */
 
 #ifdef HAVE_CONFIG_H
-#if defined (CONFIG_BROKETS)
-/* We use <config.h> instead of "config.h" so that a compilation
-   using -I. -I$srcdir will use ./config.h rather than $srcdir/config.h
-   (which it would do because it found this file in $srcdir).  */
 #include <config.h>
-#else
-#include "config.h"
-#endif
 #endif
 
 #include <sys/types.h>