projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
merge with 1.9
[gnulib.git]
/
lib
/
putenv.c
diff --git
a/lib/putenv.c
b/lib/putenv.c
index
512878c
..
47f7256
100644
(file)
--- a/
lib/putenv.c
+++ b/
lib/putenv.c
@@
-16,21
+16,45
@@
License along with the GNU C Library; see the file COPYING.LIB. If
not, write to the Free Software Foundation, Inc., 675 Mass Ave,
Cambridge, MA 02139, USA. */
not, write to the Free Software Foundation, Inc., 675 Mass Ave,
Cambridge, MA 02139, USA. */
+#ifdef HAVE_CONFIG_H
+#if defined (CONFIG_BROKETS)
+/* We use <config.h> instead of "config.h" so that a compilation
+ using -I. -I$srcdir will use ./config.h rather than $srcdir/config.h
+ (which it would do because it found this file in $srcdir). */
+#include <config.h>
+#else
+#include "config.h"
+#endif
+#endif
+
#include <sys/types.h>
#include <errno.h>
#include <sys/types.h>
#include <errno.h>
-#ifdef STDC_HEADERS
+
+/* This needs to come after some library #include
+ to get __GNU_LIBRARY__ defined. */
+#ifdef __GNU_LIBRARY__
+/* Don't include stdlib.h for non-GNU C libraries because some of them
+ contain conflicting prototypes for getopt. */
#include <stdlib.h>
#else
#include <stdlib.h>
#else
+char *malloc ();
+#endif /* GNU C library. */
+
+#ifndef STDC_HEADERS
extern int errno;
#endif
extern int errno;
#endif
-#if defined(STDC_HEADERS) || defined(
USG
)
+#if defined(STDC_HEADERS) || defined(
HAVE_STRING_H
)
#include <string.h>
#include <string.h>
+#ifndef index
#define index strchr
#define index strchr
+#endif
+#ifndef bcopy
#define bcopy(s, d, n) memcpy((d), (s), (n))
#define bcopy(s, d, n) memcpy((d), (s), (n))
-#else /* not (STDC_HEADERS or USG) */
+#endif
+#else
#include <strings.h>
#include <strings.h>
-#endif
/* STDC_HEADERS or USG */
+#endif
#ifdef HAVE_UNISTD_H
#include <unistd.h>
#ifdef HAVE_UNISTD_H
#include <unistd.h>
@@
-40,10
+64,6
@@
extern int errno;
#define NULL 0
#endif
#define NULL 0
#endif
-#if !__STDC__
-#define const
-#endif
-
extern char **environ;
/* Put STRING, which is of the form "NAME=VALUE", in the environment. */
extern char **environ;
/* Put STRING, which is of the form "NAME=VALUE", in the environment. */
@@
-86,7
+106,8
@@
putenv (string)
char **new_environ = (char **) malloc ((size + 2) * sizeof (char *));
if (new_environ == NULL)
return -1;
char **new_environ = (char **) malloc ((size + 2) * sizeof (char *));
if (new_environ == NULL)
return -1;
- (void) bcopy ((char *) environ, (char *) new_environ, size * sizeof (char *));
+ (void) bcopy ((char *) environ, (char *) new_environ,
+ size * sizeof (char *));
new_environ[size] = (char *) string;
new_environ[size + 1] = NULL;
if (last_environ != NULL)
new_environ[size] = (char *) string;
new_environ[size + 1] = NULL;
if (last_environ != NULL)