Mercurial > hg > octave-shane > gnulib-hg
annotate lib/putenv.c @ 10384:adc4d1a5982d
remove duplicate #include directives
* lib/putenv.c: Remove duplicate #include <stdlib.h>.
* lib/chdir-long.c [TEST_CHDIR]: Remove duplicate #include <stdio.h>.
| author | Jim Meyering <meyering@redhat.com> |
|---|---|
| date | Sun, 31 Aug 2008 16:24:24 +0200 |
| parents | daf5ba9fe2d9 |
| children | e8d2c6fc33ad |
| rev | line source |
|---|---|
|
9749
daf5ba9fe2d9
Remove useless "if" tests before free. Deprecate "free" module.
Jim Meyering <meyering@redhat.com>
parents:
9434
diff
changeset
|
1 /* Copyright (C) 1991, 1994, 1997-1998, 2000, 2003-2008 |
|
7302
8a1a9361108c
* _fpending.c: Include <config.h> unconditionally, since we no
Paul Eggert <eggert@cs.ucla.edu>
parents:
6275
diff
changeset
|
2 Free Software Foundation, Inc. |
|
363
ec4b36233380
Get putenv.c from /copies (derived from glibc).
Jim Meyering <jim@meyering.net>
parents:
311
diff
changeset
|
3 |
| 882 | 4 NOTE: The canonical source of this file is maintained with the GNU C |
| 5 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
|
6 |
|
9309
bbbbbf4cd1c5
Change copyright notice from GPLv2+ to GPLv3+.
Bruno Haible <bruno@clisp.org>
parents:
8234
diff
changeset
|
7 This program is free software: you can redistribute it and/or modify it |
| 882 | 8 under the terms of the GNU General Public License as published by the |
|
9309
bbbbbf4cd1c5
Change copyright notice from GPLv2+ to GPLv3+.
Bruno Haible <bruno@clisp.org>
parents:
8234
diff
changeset
|
9 Free Software Foundation; either version 3 of the License, or any |
| 882 | 10 later version. |
| 311 | 11 |
| 882 | 12 This program is distributed in the hope that it will be useful, |
| 13 but WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
| 15 GNU General Public License for more details. | |
| 9 | 16 |
| 882 | 17 You should have received a copy of the GNU General Public License |
|
9309
bbbbbf4cd1c5
Change copyright notice from GPLv2+ to GPLv3+.
Bruno Haible <bruno@clisp.org>
parents:
8234
diff
changeset
|
18 along with this program. If not, see <http://www.gnu.org/licenses/>. */ |
|
363
ec4b36233380
Get putenv.c from /copies (derived from glibc).
Jim Meyering <jim@meyering.net>
parents:
311
diff
changeset
|
19 |
|
7302
8a1a9361108c
* _fpending.c: Include <config.h> unconditionally, since we no
Paul Eggert <eggert@cs.ucla.edu>
parents:
6275
diff
changeset
|
20 #include <config.h> |
| 311 | 21 |
|
9434
b839560eec9f
Define the putenv substitute in <stdlib.h> rather than in <config.h>.
Bruno Haible <bruno@clisp.org>
parents:
9309
diff
changeset
|
22 /* Specification. */ |
|
b839560eec9f
Define the putenv substitute in <stdlib.h> rather than in <config.h>.
Bruno Haible <bruno@clisp.org>
parents:
9309
diff
changeset
|
23 #include <stdlib.h> |
|
8214
822e9380142e
Minor fixups to port to Solaris 10 with Sun C 5.8.
Paul Eggert <eggert@cs.ucla.edu>
parents:
7302
diff
changeset
|
24 |
|
4347
df44e79ce676
.h files should stand alone, but we shouldn't include <sys/types.h>
Paul Eggert <eggert@cs.ucla.edu>
parents:
2411
diff
changeset
|
25 #include <stddef.h> |
|
1229
ed51f6d45a14
(sys/types.h): Include to get size_t on some systems.
Jim Meyering <jim@meyering.net>
parents:
959
diff
changeset
|
26 |
|
2411
90a1662ba7ec
Move inclusion of errno.h so it follows that of sys/types.h,
Jim Meyering <jim@meyering.net>
parents:
1570
diff
changeset
|
27 /* 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
|
28 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
|
29 #include <errno.h> |
| 5159 | 30 #ifndef __set_errno |
| 4364 | 31 # define __set_errno(ev) ((errno) = (ev)) |
| 32 #endif | |
|
2411
90a1662ba7ec
Move inclusion of errno.h so it follows that of sys/types.h,
Jim Meyering <jim@meyering.net>
parents:
1570
diff
changeset
|
33 |
| 4672 | 34 #include <string.h> |
| 6275 | 35 #include <unistd.h> |
| 311 | 36 |
|
363
ec4b36233380
Get putenv.c from /copies (derived from glibc).
Jim Meyering <jim@meyering.net>
parents:
311
diff
changeset
|
37 #if HAVE_GNU_LD |
| 653 | 38 # define environ __environ |
|
363
ec4b36233380
Get putenv.c from /copies (derived from glibc).
Jim Meyering <jim@meyering.net>
parents:
311
diff
changeset
|
39 #else |
| 311 | 40 extern char **environ; |
|
363
ec4b36233380
Get putenv.c from /copies (derived from glibc).
Jim Meyering <jim@meyering.net>
parents:
311
diff
changeset
|
41 #endif |
|
ec4b36233380
Get putenv.c from /copies (derived from glibc).
Jim Meyering <jim@meyering.net>
parents:
311
diff
changeset
|
42 |
| 4364 | 43 #if _LIBC |
| 44 /* This lock protects against simultaneous modifications of `environ'. */ | |
| 45 # include <bits/libc-lock.h> | |
| 46 __libc_lock_define_initialized (static, envlock) | |
| 47 # define LOCK __libc_lock_lock (envlock) | |
| 48 # define UNLOCK __libc_lock_unlock (envlock) | |
| 49 #else | |
| 50 # define LOCK | |
| 51 # define UNLOCK | |
| 52 #endif | |
| 53 | |
| 54 static int | |
|
8234
e488ab5dfa4f
Avoid conflicting types for 'unsetenv' on FreeBSD.
Jim Meyering <jim@meyering.net>
parents:
8214
diff
changeset
|
55 _unsetenv (const char *name) |
| 4364 | 56 { |
| 57 size_t len; | |
| 58 char **ep; | |
| 311 | 59 |
| 4364 | 60 if (name == NULL || *name == '\0' || strchr (name, '=') != NULL) |
| 61 { | |
| 62 __set_errno (EINVAL); | |
| 63 return -1; | |
| 64 } | |
| 65 | |
| 66 len = strlen (name); | |
| 67 | |
| 68 LOCK; | |
| 69 | |
| 70 ep = environ; | |
| 71 while (*ep != NULL) | |
| 72 if (!strncmp (*ep, name, len) && (*ep)[len] == '=') | |
| 73 { | |
| 74 /* Found it. Remove this pointer by moving later ones back. */ | |
| 75 char **dp = ep; | |
| 76 | |
| 77 do | |
| 78 dp[0] = dp[1]; | |
| 79 while (*dp++); | |
| 80 /* Continue the loop in case NAME appears again. */ | |
| 81 } | |
| 82 else | |
| 83 ++ep; | |
| 84 | |
| 85 UNLOCK; | |
| 86 | |
| 87 return 0; | |
| 88 } | |
| 89 | |
| 90 | |
| 91 /* Put STRING, which is of the form "NAME=VALUE", in the environment. | |
| 92 If STRING contains no `=', then remove STRING from the environment. */ | |
| 9 | 93 int |
|
9434
b839560eec9f
Define the putenv substitute in <stdlib.h> rather than in <config.h>.
Bruno Haible <bruno@clisp.org>
parents:
9309
diff
changeset
|
94 putenv (char *string) |
| 9 | 95 { |
|
363
ec4b36233380
Get putenv.c from /copies (derived from glibc).
Jim Meyering <jim@meyering.net>
parents:
311
diff
changeset
|
96 const char *const name_end = strchr (string, '='); |
| 9 | 97 register size_t size; |
| 98 register char **ep; | |
| 99 | |
| 100 if (name_end == NULL) | |
| 101 { | |
| 102 /* Remove the variable from the environment. */ | |
|
8234
e488ab5dfa4f
Avoid conflicting types for 'unsetenv' on FreeBSD.
Jim Meyering <jim@meyering.net>
parents:
8214
diff
changeset
|
103 return _unsetenv (string); |
| 9 | 104 } |
| 105 | |
| 106 size = 0; | |
| 311 | 107 for (ep = environ; *ep != NULL; ++ep) |
| 108 if (!strncmp (*ep, string, name_end - string) && | |
| 9 | 109 (*ep)[name_end - string] == '=') |
| 110 break; | |
| 111 else | |
| 112 ++size; | |
| 113 | |
| 114 if (*ep == NULL) | |
| 115 { | |
| 116 static char **last_environ = NULL; | |
| 311 | 117 char **new_environ = (char **) malloc ((size + 2) * sizeof (char *)); |
| 9 | 118 if (new_environ == NULL) |
| 119 return -1; | |
|
363
ec4b36233380
Get putenv.c from /copies (derived from glibc).
Jim Meyering <jim@meyering.net>
parents:
311
diff
changeset
|
120 (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
|
121 size * sizeof (char *)); |
| 9 | 122 new_environ[size] = (char *) string; |
| 123 new_environ[size + 1] = NULL; | |
|
9749
daf5ba9fe2d9
Remove useless "if" tests before free. Deprecate "free" module.
Jim Meyering <meyering@redhat.com>
parents:
9434
diff
changeset
|
124 free (last_environ); |
| 9 | 125 last_environ = new_environ; |
| 311 | 126 environ = new_environ; |
| 9 | 127 } |
| 128 else | |
|
9434
b839560eec9f
Define the putenv substitute in <stdlib.h> rather than in <config.h>.
Bruno Haible <bruno@clisp.org>
parents:
9309
diff
changeset
|
129 *ep = string; |
| 9 | 130 |
| 131 return 0; | |
| 132 } |