projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
update from texinfo
[gnulib.git]
/
lib
/
putenv.c
diff --git
a/lib/putenv.c
b/lib/putenv.c
index
d0573c6
..
030f567
100644
(file)
--- a/
lib/putenv.c
+++ b/
lib/putenv.c
@@
-1,5
+1,5
@@
-/* Copyright (C) 1991, 1994, 1997-1998, 2000, 2003-20
08
- F
ree Software F
oundation, Inc.
+/* Copyright (C) 1991, 1994, 1997-1998, 2000, 2003-20
10 Free Software
+ Foundation, Inc.
NOTE: The canonical source of this file is maintained with the GNU C
Library. Bugs can be reported to bug-glibc@prep.ai.mit.edu.
NOTE: The canonical source of this file is maintained with the GNU C
Library. Bugs can be reported to bug-glibc@prep.ai.mit.edu.
@@
-31,7
+31,6
@@
# define __set_errno(ev) ((errno) = (ev))
#endif
# define __set_errno(ev) ((errno) = (ev))
#endif
-#include <stdlib.h>
#include <string.h>
#include <unistd.h>
#include <string.h>
#include <unistd.h>
@@
-45,8
+44,8
@@
extern char **environ;
/* This lock protects against simultaneous modifications of `environ'. */
# include <bits/libc-lock.h>
__libc_lock_define_initialized (static, envlock)
/* This lock protects against simultaneous modifications of `environ'. */
# include <bits/libc-lock.h>
__libc_lock_define_initialized (static, envlock)
-# define LOCK __libc_lock_lock (envlock)
-# define UNLOCK
__libc_lock_unlock (envlock)
+# define LOCK
__libc_lock_lock (envlock)
+# define UNLOCK __libc_lock_unlock (envlock)
#else
# define LOCK
# define UNLOCK
#else
# define LOCK
# define UNLOCK
@@
-72,13
+71,13
@@
_unsetenv (const char *name)
while (*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
- dp[0] = dp[1];
- while (*dp++);
- /* Continue the loop in case NAME appears again. */
+
do
+
dp[0] = dp[1];
+
while (*dp++);
+
/* Continue the loop in case NAME appears again. */
}
else
++ep;
}
else
++ep;
@@
-107,7
+106,7
@@
putenv (char *string)
size = 0;
for (ep = environ; *ep != NULL; ++ep)
if (!strncmp (*ep, string, name_end - string) &&
size = 0;
for (ep = environ; *ep != NULL; ++ep)
if (!strncmp (*ep, string, name_end - string) &&
- (*ep)[name_end - string] == '=')
+
(*ep)[name_end - string] == '=')
break;
else
++size;
break;
else
++size;
@@
-117,9
+116,9
@@
putenv (char *string)
static char **last_environ = NULL;
char **new_environ = (char **) malloc ((size + 2) * sizeof (char *));
if (new_environ == NULL)
static char **last_environ = NULL;
char **new_environ = (char **) malloc ((size + 2) * sizeof (char *));
if (new_environ == NULL)
- return -1;
+
return -1;
(void) memcpy ((void *) new_environ, (void *) environ,
(void) memcpy ((void *) new_environ, (void *) environ,
- size * sizeof (char *));
+
size * sizeof (char *));
new_environ[size] = (char *) string;
new_environ[size + 1] = NULL;
free (last_environ);
new_environ[size] = (char *) string;
new_environ[size + 1] = NULL;
free (last_environ);