diff options
| author | Jörg Frings-Fürst <debian@jff.email> | 2026-03-10 13:24:07 +0100 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff.email> | 2026-03-10 13:24:07 +0100 |
| commit | cfd1f17f1a85d95ea12bca8dae42add7dad1ad11 (patch) | |
| tree | 8016486f8ee7157213f2d09ff2491bfa9c94638a /tests/putenv.c | |
| parent | 14e4d584d0121031ec40e6c35869745f1747ff29 (diff) | |
| parent | 1403307d6e2fb4e7b5d97a35f40d1e95134561ab (diff) | |
Merge branch 'release/debian/1.4.2-1'HEADdebian/1.4.2-1master
Diffstat (limited to 'tests/putenv.c')
| -rw-r--r-- | tests/putenv.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/tests/putenv.c b/tests/putenv.c index d3084c9e..a8abede7 100644 --- a/tests/putenv.c +++ b/tests/putenv.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1991, 1994, 1997-1998, 2000, 2003-2024 Free Software +/* Copyright (C) 1991, 1994, 1997-1998, 2000, 2003-2026 Free Software Foundation, Inc. NOTE: The canonical source of this file is maintained with the GNU C @@ -70,7 +70,6 @@ int putenv (char *string) { const char *name_end = strchr (string, '='); - char **ep; if (name_end == NULL) { @@ -97,16 +96,15 @@ putenv (char *string) /* _putenv ("NAME=") unsets NAME, so invoke _putenv ("NAME= ") to allocate the environ vector and then replace the new entry with "NAME=". */ - int putenv_result; char *name_x = malloc (name_end - string + sizeof "= "); if (!name_x) return -1; memcpy (name_x, string, name_end - string + 1); name_x[name_end - string + 1] = ' '; name_x[name_end - string + 2] = 0; - putenv_result = _putenv (name_x); - for (ep = environ; *ep; ep++) - if (strcmp (*ep, name_x) == 0) + int putenv_result = _putenv (name_x); + for (char **ep = environ; *ep; ep++) + if (streq (*ep, name_x)) { *ep = string; break; @@ -125,6 +123,7 @@ putenv (char *string) return putenv_result; } #else + char **ep; for (ep = environ; *ep; ep++) if (strncmp (*ep, string, name_end - string) == 0 && (*ep)[name_end - string] == '=') |