upstream-mirrors/gnulib
1
0
Fork 0
mirror of https://https.git.savannah.gnu.org/git/gnulib.git synced 2026-09-01 02:34:55 +00:00
Code Activity

merge with 1.10n5

Browse Source
This commit is contained in:
Jim Meyering
1994-10-01 04:48:44 +00:00
parent a474e30be0
commit 28cceeb00c
3 changed files with 137 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/putenv.c
+63 -33
View File
@@ -1,46 +1,76 @@
/* Copyright (C) 1991 Free Software Foundation, Inc.
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 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 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.
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.
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. */
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 <errno.h>
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
#ifndef HAVE_GNU_LD
#define __environ environ
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#include <sys/types.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
#endif
extern char **environ;
/* Put STRING, which is of the form "NAME=VALUE", in the environment. */
int
DEFUN(putenv, (string), CONST char *string)
putenv (string)
const char *string;
{
CONST char *CONST name_end = strchr(string, '=');
char *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)
{
@@ -53,8 +83,8 @@ DEFUN(putenv, (string), CONST char *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
@@ -63,16 +93,16 @@ DEFUN(putenv, (string), CONST char *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;
(void) memcpy((PTR) new_environ, (PTR) __environ, size * sizeof(char *));
memcpy ((char *) new_environ, (char *) environ, size * sizeof (char *));
new_environ[size] = (char *) string;
new_environ[size + 1] = NULL;
if (last_environ != NULL)
free((PTR) last_environ);
free ((char *) last_environ);
last_environ = new_environ;
__environ = new_environ;
environ = new_environ;
}
else
*ep = (char *) string;
lib/strcspn.c
+27 -20
View File
@@ -1,36 +1,43 @@
/* Copyright (C) 1991 Free Software Foundation, Inc.
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 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 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.
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.
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. */
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. */
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#include <ansidecl.h>
#ifdef HAVE_STRING_H
#include <string.h>
#else
#include <strings.h>
#ifndef strchr
#define strchr index
#endif
#endif
/* Return the length of the maximum inital segment of S
which contains no characters from REJECT. */
size_t
DEFUN(strcspn, (s, reject),
register CONST char *s AND register CONST char *reject)
int
strcspn (s, reject)
register char *s;
register char *reject;
{
register size_t count = 0;
register int count = 0;
while (*s != '\0')
if (strchr(reject, *s++) == NULL)
if (strchr (reject, *s++) == 0)
++count;
else
return count;
lib/strtod.c
+47 -37
View File
@@ -1,46 +1,60 @@
/* Copyright (C) 1991, 1992 Free Software Foundation, Inc.
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 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 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.
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.
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. */
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. */
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#include <ansidecl.h>
#include <localeinfo.h>
#include <errno.h>
#include <float.h>
#include <ctype.h>
#include <stdlib.h>
#include <string.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 <stdlib.h>
#include <string.h>
#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
DEFUN(strtod, (nptr, endptr), CONST char *nptr AND char **endptr)
strtod (nptr, endptr)
const char *nptr;
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;
@@ -51,14 +65,10 @@ DEFUN(strtod, (nptr, endptr), CONST char *nptr AND char **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. */
@@ -94,7 +104,7 @@ DEFUN(strtod, (nptr, endptr), CONST char *nptr AND char **endptr)
if (got_dot)
--exponent;
}
else if (!got_dot && (wchar_t) *s == decimal)
else if (!got_dot && *s == '.')
/* Record that we have found the decimal point. */
got_dot = 1;
else
@@ -105,7 +115,7 @@ DEFUN(strtod, (nptr, endptr), CONST char *nptr AND char **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;
@@ -114,7 +124,7 @@ DEFUN(strtod, (nptr, endptr), CONST char *nptr AND char **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
@@ -147,32 +157,32 @@ DEFUN(strtod, (nptr, endptr), CONST char *nptr AND char **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;