projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
When trying to open ".", treat ESTALE like EACCES.
[gnulib.git]
/
lib
/
putenv.c
diff --git
a/lib/putenv.c
b/lib/putenv.c
index
9c7cf66
..
0602e44
100644
(file)
--- a/
lib/putenv.c
+++ b/
lib/putenv.c
@@
-1,4
+1,5
@@
-/* Copyright (C) 1991, 1994, 1997, 1998, 2000, 2003, 2004, 2005 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 1994, 1997, 1998, 2000, 2003, 2004, 2005, 2006, 2007
+ 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.
@@
-17,9
+18,13
@@
along with this program; if not, write to the Free Software Foundation,
Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
along with this program; if not, write to the Free Software Foundation,
Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
+
+/* undef putenv here, because some (e.g., Solaris 10) declare putenv in
+ with a non-const argument. That would conflict with the declaration of
+ rpl_putenv below (due to the #define putenv rpl_putenv from config.h). */
+#undef putenv
+int rpl_putenv (char const *);
#include <stddef.h>
#include <stddef.h>
@@
-30,15
+35,8
@@
# define __set_errno(ev) ((errno) = (ev))
#endif
# define __set_errno(ev) ((errno) = (ev))
#endif
-/* Don't include stdlib.h because some (e.g., Solaris 7) declare putenv
- with a non-const argument. That would conflict with the declaration of
- rpl_putenv below (due to the #define putenv rpl_putenv from config.h). */
-
-void *malloc ();
-void free ();
-
+#include <stdlib.h>
#include <string.h>
#include <string.h>
-
#include <unistd.h>
#if HAVE_GNU_LD
#include <unistd.h>
#if HAVE_GNU_LD
@@
-59,7
+57,7
@@
__libc_lock_define_initialized (static, envlock)
#endif
static int
#endif
static int
-unsetenv (const char *name)
+
_
unsetenv (const char *name)
{
size_t len;
char **ep;
{
size_t len;
char **ep;
@@
-107,7
+105,7
@@
rpl_putenv (const char *string)
if (name_end == NULL)
{
/* Remove the variable from the environment. */
if (name_end == NULL)
{
/* Remove the variable from the environment. */
- return unsetenv (string);
+ return
_
unsetenv (string);
}
size = 0;
}
size = 0;