Mercurial > hg > octave-kai > gnulib-hg
annotate lib/putenv.c @ 3466:45d73183ee54
Revert some of the previous change; intead,
fix the HAVE_GETCWD_NULL code to behave more like the
!HAVE_GETCWD_NULL code used to.
Include "xalloc.h".
(xgetcwd): Do not return NULL when memory is exhausted; instead,
invoke xalloc_die.
| author | Jim Meyering <jim@meyering.net> |
|---|---|
| date | Tue, 04 Sep 2001 20:28:31 +0000 |
| parents | 90a1662ba7ec |
| children | df44e79ce676 |
| rev | line source |
|---|---|
|
2411
90a1662ba7ec
Move inclusion of errno.h so it follows that of sys/types.h,
Jim Meyering <jim@meyering.net>
parents:
1570
diff
changeset
|
1 /* Copyright (C) 1991, 1994, 1997, 1998, 2000 Free Software Foundation, Inc. |
|
363
ec4b36233380
Get putenv.c from /copies (derived from glibc).
Jim Meyering <jim@meyering.net>
parents:
311
diff
changeset
|
2 |
| 882 | 3 NOTE: The canonical source of this file is maintained with the GNU C |
| 4 Library. Bugs can be reported to bug-glibc@prep.ai.mit.edu. | |
|
363
ec4b36233380
Get putenv.c from /copies (derived from glibc).
Jim Meyering <jim@meyering.net>
parents:
311
diff
changeset
|
5 |
| 882 | 6 This program is free software; you can redistribute it and/or modify it |
| 7 under the terms of the GNU General Public License as published by the | |
| 8 Free Software Foundation; either version 2, or (at your option) any | |
| 9 later version. | |
| 311 | 10 |
| 882 | 11 This program is distributed in the hope that it will be useful, |
| 12 but WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 13 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
| 14 GNU General Public License for more details. | |
| 9 | 15 |
| 882 | 16 You should have received a copy of the GNU General Public License |
| 17 along with this program; if not, write to the Free Software Foundation, | |
| 18 Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ | |
|
363
ec4b36233380
Get putenv.c from /copies (derived from glibc).
Jim Meyering <jim@meyering.net>
parents:
311
diff
changeset
|
19 |
| 882 | 20 #if HAVE_CONFIG_H |
| 653 | 21 # include <config.h> |
| 311 | 22 #endif |
| 23 | |
|
1229
ed51f6d45a14
(sys/types.h): Include to get size_t on some systems.
Jim Meyering <jim@meyering.net>
parents:
959
diff
changeset
|
24 #include <sys/types.h> |
|
ed51f6d45a14
(sys/types.h): Include to get size_t on some systems.
Jim Meyering <jim@meyering.net>
parents:
959
diff
changeset
|
25 |
|
2411
90a1662ba7ec
Move inclusion of errno.h so it follows that of sys/types.h,
Jim Meyering <jim@meyering.net>
parents:
1570
diff
changeset
|
26 /* Include errno.h *after* sys/types.h to work around header problems |
|
90a1662ba7ec
Move inclusion of errno.h so it follows that of sys/types.h,
Jim Meyering <jim@meyering.net>
parents:
1570
diff
changeset
|
27 on AIX 3.2.5. */ |
|
90a1662ba7ec
Move inclusion of errno.h so it follows that of sys/types.h,
Jim Meyering <jim@meyering.net>
parents:
1570
diff
changeset
|
28 #include <errno.h> |
|
90a1662ba7ec
Move inclusion of errno.h so it follows that of sys/types.h,
Jim Meyering <jim@meyering.net>
parents:
1570
diff
changeset
|
29 |
|
1570
0a751006ca02
Don't include stdlib.h and declare malloc and free.
Jim Meyering <jim@meyering.net>
parents:
1556
diff
changeset
|
30 /* Don't include stdlib.h because some (e.g., Solaris 2.7) declare putenv |
|
0a751006ca02
Don't include stdlib.h and declare malloc and free.
Jim Meyering <jim@meyering.net>
parents:
1556
diff
changeset
|
31 with a non-const argument. That would conflict with the declaration of |
|
0a751006ca02
Don't include stdlib.h and declare malloc and free.
Jim Meyering <jim@meyering.net>
parents:
1556
diff
changeset
|
32 rpl_putenv below (due to the #define putenv rpl_putenv from config.h). */ |
|
0a751006ca02
Don't include stdlib.h and declare malloc and free.
Jim Meyering <jim@meyering.net>
parents:
1556
diff
changeset
|
33 |
|
0a751006ca02
Don't include stdlib.h and declare malloc and free.
Jim Meyering <jim@meyering.net>
parents:
1556
diff
changeset
|
34 char *malloc (); |
|
0a751006ca02
Don't include stdlib.h and declare malloc and free.
Jim Meyering <jim@meyering.net>
parents:
1556
diff
changeset
|
35 void free (); |
|
1556
44617e0f6ffe
Redefine putenv before including stdlib.h to work
Jim Meyering <jim@meyering.net>
parents:
1229
diff
changeset
|
36 |
|
363
ec4b36233380
Get putenv.c from /copies (derived from glibc).
Jim Meyering <jim@meyering.net>
parents:
311
diff
changeset
|
37 #if defined (__GNU_LIBRARY__) || defined (HAVE_STRING_H) |
| 653 | 38 # include <string.h> |
| 311 | 39 #endif |
|
363
ec4b36233380
Get putenv.c from /copies (derived from glibc).
Jim Meyering <jim@meyering.net>
parents:
311
diff
changeset
|
40 #if defined (__GNU_LIBRARY__) || defined (HAVE_UNISTD_H) |
| 653 | 41 # include <unistd.h> |
| 311 | 42 #endif |
| 43 | |
|
363
ec4b36233380
Get putenv.c from /copies (derived from glibc).
Jim Meyering <jim@meyering.net>
parents:
311
diff
changeset
|
44 #if !defined (__GNU_LIBRARY__) && !defined (HAVE_STRCHR) |
| 653 | 45 # define strchr index |
|
363
ec4b36233380
Get putenv.c from /copies (derived from glibc).
Jim Meyering <jim@meyering.net>
parents:
311
diff
changeset
|
46 #endif |
|
ec4b36233380
Get putenv.c from /copies (derived from glibc).
Jim Meyering <jim@meyering.net>
parents:
311
diff
changeset
|
47 #if !defined (__GNU_LIBRARY__) && !defined (HAVE_MEMCPY) |
| 653 | 48 # define memcpy(d,s,n) bcopy ((s), (d), (n)) |
| 311 | 49 #endif |
| 50 | |
|
363
ec4b36233380
Get putenv.c from /copies (derived from glibc).
Jim Meyering <jim@meyering.net>
parents:
311
diff
changeset
|
51 #if HAVE_GNU_LD |
| 653 | 52 # define environ __environ |
|
363
ec4b36233380
Get putenv.c from /copies (derived from glibc).
Jim Meyering <jim@meyering.net>
parents:
311
diff
changeset
|
53 #else |
| 311 | 54 extern char **environ; |
|
363
ec4b36233380
Get putenv.c from /copies (derived from glibc).
Jim Meyering <jim@meyering.net>
parents:
311
diff
changeset
|
55 #endif |
|
ec4b36233380
Get putenv.c from /copies (derived from glibc).
Jim Meyering <jim@meyering.net>
parents:
311
diff
changeset
|
56 |
|
1229
ed51f6d45a14
(sys/types.h): Include to get size_t on some systems.
Jim Meyering <jim@meyering.net>
parents:
959
diff
changeset
|
57 #ifndef NULL |
|
ed51f6d45a14
(sys/types.h): Include to get size_t on some systems.
Jim Meyering <jim@meyering.net>
parents:
959
diff
changeset
|
58 # define NULL 0 |
|
ed51f6d45a14
(sys/types.h): Include to get size_t on some systems.
Jim Meyering <jim@meyering.net>
parents:
959
diff
changeset
|
59 #endif |
|
ed51f6d45a14
(sys/types.h): Include to get size_t on some systems.
Jim Meyering <jim@meyering.net>
parents:
959
diff
changeset
|
60 |
| 311 | 61 |
| 9 | 62 /* Put STRING, which is of the form "NAME=VALUE", in the environment. */ |
| 63 int | |
|
1556
44617e0f6ffe
Redefine putenv before including stdlib.h to work
Jim Meyering <jim@meyering.net>
parents:
1229
diff
changeset
|
64 rpl_putenv (const char *string) |
| 9 | 65 { |
|
363
ec4b36233380
Get putenv.c from /copies (derived from glibc).
Jim Meyering <jim@meyering.net>
parents:
311
diff
changeset
|
66 const char *const name_end = strchr (string, '='); |
| 9 | 67 register size_t size; |
| 68 register char **ep; | |
| 69 | |
| 70 if (name_end == NULL) | |
| 71 { | |
| 72 /* Remove the variable from the environment. */ | |
| 311 | 73 size = strlen (string); |
| 74 for (ep = environ; *ep != NULL; ++ep) | |
| 75 if (!strncmp (*ep, string, size) && (*ep)[size] == '=') | |
| 9 | 76 { |
| 77 while (ep[1] != NULL) | |
| 78 { | |
| 79 ep[0] = ep[1]; | |
| 80 ++ep; | |
| 81 } | |
| 82 *ep = NULL; | |
| 83 return 0; | |
| 84 } | |
| 85 } | |
| 86 | |
| 87 size = 0; | |
| 311 | 88 for (ep = environ; *ep != NULL; ++ep) |
| 89 if (!strncmp (*ep, string, name_end - string) && | |
| 9 | 90 (*ep)[name_end - string] == '=') |
| 91 break; | |
| 92 else | |
| 93 ++size; | |
| 94 | |
| 95 if (*ep == NULL) | |
| 96 { | |
| 97 static char **last_environ = NULL; | |
| 311 | 98 char **new_environ = (char **) malloc ((size + 2) * sizeof (char *)); |
| 9 | 99 if (new_environ == NULL) |
| 100 return -1; | |
|
363
ec4b36233380
Get putenv.c from /copies (derived from glibc).
Jim Meyering <jim@meyering.net>
parents:
311
diff
changeset
|
101 (void) memcpy ((void *) new_environ, (void *) environ, |
|
ec4b36233380
Get putenv.c from /copies (derived from glibc).
Jim Meyering <jim@meyering.net>
parents:
311
diff
changeset
|
102 size * sizeof (char *)); |
| 9 | 103 new_environ[size] = (char *) string; |
| 104 new_environ[size + 1] = NULL; | |
| 105 if (last_environ != NULL) | |
|
363
ec4b36233380
Get putenv.c from /copies (derived from glibc).
Jim Meyering <jim@meyering.net>
parents:
311
diff
changeset
|
106 free ((void *) last_environ); |
| 9 | 107 last_environ = new_environ; |
| 311 | 108 environ = new_environ; |
| 9 | 109 } |
| 110 else | |
| 111 *ep = (char *) string; | |
| 112 | |
| 113 return 0; | |
| 114 } |