OpenE2K
/
glibc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* stdlib/setenv.c (unsetenv): Don't search environment if it does 

not exist.
This commit is contained in:
Ulrich Drepper 2008-12-02 01:40:59 +00:00
parent 37a6a271bf
commit 1fa7ae05b9
2 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2008-12-01 Ulrich Drepper <drepper@redhat.com>
* stdlib/setenv.c (unsetenv): Don't search environment if it does
not exist.
2008-11-29 Ulrich Drepper <drepper@redhat.com> 2008-11-29 Ulrich Drepper <drepper@redhat.com>
* login/utmp_file.c (file_writable): New variable. * login/utmp_file.c (file_writable): New variable.

27
stdlib/setenv.c
View File

@ -1,4 +1,4 @@
/* Copyright (C) 1992,1995-2001,2004 Free Software Foundation, Inc. /* Copyright (C) 1992,1995-2001,2004, 2008 Free Software Foundation, Inc.
This file is part of the GNU C Library. This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or The GNU C Library is free software; you can redistribute it and/or
@ -292,19 +292,20 @@ unsetenv (name)
LOCK; LOCK;
ep = __environ; ep = __environ;
while (*ep != NULL) if (ep != NULL)
if (!strncmp (*ep, name, len) && (*ep)[len] == '=') while (*ep != NULL)
{ if (!strncmp (*ep, name, len) && (*ep)[len] == '=')
/* Found it. Remove this pointer by moving later ones back. */ {
char **dp = ep; /* Found it. Remove this pointer by moving later ones back. */
char **dp = ep;
do do
dp[0] = dp[1]; dp[0] = dp[1];
while (*dp++); while (*dp++);
/* Continue the loop in case NAME appears again. */ /* Continue the loop in case NAME appears again. */
} }
else else
++ep; ++ep;
UNLOCK; UNLOCK;