# HG changeset patch # User Jim Meyering # Date 780985992 0 # Node ID bfbbbf27aa15e58d34558f7c3a3ac0ea30511ddb # Parent d8e0f516867f44d4ec4fbb8a65cf0d9027d4df41 GNU shell utilities diff -r d8e0f516867f -r bfbbbf27aa15 lib/putenv.c --- a/lib/putenv.c Thu Sep 29 17:33:34 1994 +0000 +++ b/lib/putenv.c Sat Oct 01 04:33:12 1994 +0000 @@ -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. - - 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. +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. - 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 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. -#ifdef HAVE_CONFIG_H -#include -#endif - -#include -#include -#ifndef errno -extern int errno; -#endif +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. -/* 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__ +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 +#include #include -#else -char *malloc (); -#endif /* GNU C library. */ - -#if defined(STDC_HEADERS) || defined(HAVE_STRING_H) #include -#else -#include -#ifndef strchr -#define strchr index -#endif -#ifndef memcpy -#define memcpy(d, s, n) bcopy((s), (d), (n)) -#endif -#endif +#include -#ifdef HAVE_UNISTD_H -#include +#ifndef HAVE_GNU_LD +#define __environ environ #endif -#ifndef NULL -#define NULL 0 -#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 @@ } 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 @@ 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 -r d8e0f516867f -r bfbbbf27aa15 lib/strcspn.c --- a/lib/strcspn.c Thu Sep 29 17:33:34 1994 +0000 +++ b/lib/strcspn.c Sat Oct 01 04:33:12 1994 +0000 @@ -1,43 +1,36 @@ /* 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. */ - -#ifdef HAVE_CONFIG_H -#include -#endif +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_STRING_H +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 #include -#else -#include -#ifndef strchr -#define strchr index -#endif -#endif + /* Return the length of the maximum inital segment of S which contains no characters from REJECT. */ -int -strcspn (s, reject) - register char *s; - register char *reject; +size_t +DEFUN(strcspn, (s, reject), + register CONST char *s AND register CONST char *reject) { - register int count = 0; + register size_t count = 0; while (*s != '\0') - if (strchr (reject, *s++) == 0) + if (strchr(reject, *s++) == NULL) ++count; else return count; diff -r d8e0f516867f -r bfbbbf27aa15 lib/strtod.c --- a/lib/strtod.c Thu Sep 29 17:33:34 1994 +0000 +++ b/lib/strtod.c Sat Oct 01 04:33:12 1994 +0000 @@ -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 -#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 +#include #include +#include #include +#include +#include #include -#ifdef HAVE_FLOAT_H -#include -#else -#define DBL_MAX 1.7976931348623159e+308 -#define DBL_MIN 2.2250738585072010e-308 -#endif - -#if STDC_HEADERS -#include -#include -#else -#define NULL 0 -extern int errno; -#ifndef HUGE_VAL -#define HUGE_VAL HUGE -#endif -#endif /* 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 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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;