diff options
Diffstat (limited to 'lib/putenv.c')
| -rw-r--r-- | lib/putenv.c | 84 |
1 files changed, 57 insertions, 27 deletions
diff --git a/lib/putenv.c b/lib/putenv.c index 9ba55a70ff..06e3254b64 100644 --- a/lib/putenv.c +++ b/lib/putenv.c @@ -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. */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif -#include <ansidecl.h> +#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 HAVE_GNU_LD -#define __environ environ +#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; |