From f157b53cbf1e21d419321048d5930d77207fac62 Mon Sep 17 00:00:00 2001 From: Andreas Jaeger Date: Fri, 25 Aug 2000 13:30:57 +0000 Subject: [PATCH] * sysdeps/generic/dl-environ.c (unsetenv): Follow change to the real unsetenv implementation from 1999-07-29 [PR libc/1714]. --- sysdeps/generic/dl-environ.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/sysdeps/generic/dl-environ.c b/sysdeps/generic/dl-environ.c index 433102757c3..19637917a56 100644 --- a/sysdeps/generic/dl-environ.c +++ b/sysdeps/generic/dl-environ.c @@ -1,5 +1,5 @@ -/*Environment handling for dynamic loader. - Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc. +/* Environment handling for dynamic loader. + Copyright (C) 1995, 1996, 1997, 1998, 2000 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -55,7 +55,8 @@ unsetenv (const char *name) const size_t len = strlen (name); char **ep; - for (ep = _environ; *ep != NULL; ++ep) + ep = _environ; + while (*ep != NULL) if (!strncmp (*ep, name, len) && (*ep)[len] == '=') { /* Found it. Remove this pointer by moving later ones back. */ @@ -66,4 +67,6 @@ unsetenv (const char *name) while (*dp++); /* Continue the loop in case NAME appears again. */ } + else + ++ep; } -- 2.47.2