yann@1: 2000-05-03 Ulrich Drepper yann@1: yann@1: * sysdeps/generic/dl-environ.c (unsetenv): Follow change to the yann@1: real unsetenv implementation from 1999-07-29 [PR libc/1714]. yann@1: yann@1: --- glibc-2.1.3/sysdeps/generic/dl-environ.c.jj Thu Jul 23 16:56:52 1998 yann@1: +++ glibc-2.1.3/sysdeps/generic/dl-environ.c Tue May 9 13:48:11 2000 yann@1: @@ -1,5 +1,5 @@ yann@1: -/*Environment handling for dynamic loader. yann@1: - Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc. yann@1: +/* Environment handling for dynamic loader. yann@1: + Copyright (C) 1995, 1996, 1997, 1998, 2000 Free Software Foundation, Inc. yann@1: This file is part of the GNU C Library. yann@1: yann@1: The GNU C Library is free software; you can redistribute it and/or yann@1: @@ -55,7 +55,8 @@ unsetenv (const char *name) yann@1: const size_t len = strlen (name); yann@1: char **ep; yann@1: yann@1: - for (ep = _environ; *ep != NULL; ++ep) yann@1: + ep = _environ; yann@1: + while (*ep != NULL) yann@1: if (!strncmp (*ep, name, len) && (*ep)[len] == '=') yann@1: { yann@1: /* Found it. Remove this pointer by moving later ones back. */ yann@1: @@ -66,4 +67,6 @@ unsetenv (const char *name) yann@1: while (*dp++); yann@1: /* Continue the loop in case NAME appears again. */ yann@1: } yann@1: + else yann@1: + ++ep; yann@1: }