projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
(distclean): Remove .deps.
[gnulib.git]
/
lib
/
putenv.c
diff --git
a/lib/putenv.c
b/lib/putenv.c
index
9ba55a7
..
b39fb64
100644
(file)
--- a/
lib/putenv.c
+++ b/
lib/putenv.c
@@
-1,4
+1,5
@@
-/* Copyright (C) 1991 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 1994 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,30
+18,57
@@
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
along with this program; if not, write to the Free Software
Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
-#include <ansidecl.h>
#include <errno.h>
#include <errno.h>
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+/* Define-away any (possibly conflicting) prototype of putenv.
+ Many systems omit the `const' attribute on the argument. */
+#define putenv _sys_putenv
+
+#if defined (__GNU_LIBRARY__) || defined (HAVE_STDLIB_H)
#include <stdlib.h>
#include <stdlib.h>
+#endif
+#if defined (__GNU_LIBRARY__) || defined (HAVE_STRING_H)
#include <string.h>
#include <string.h>
+#endif
+#if defined (__GNU_LIBRARY__) || defined (HAVE_UNISTD_H)
#include <unistd.h>
#include <unistd.h>
+#endif
+
+#undef putenv
+
+#if !defined (__GNU_LIBRARY__) && !defined (HAVE_STRCHR)
+#define strchr index
+#endif
+#if !defined (__GNU_LIBRARY__) && !defined (HAVE_MEMCPY)
+#define memcpy(d,s,n) bcopy ((s), (d), (n))
+#endif
-#ifndef HAVE_GNU_LD
-#define __environ environ
+#if HAVE_GNU_LD
+#define environ __environ
+#else
+extern char **environ;
#endif
#endif
+
/* Put STRING, which is of the form "NAME=VALUE", in the environment. */
int
/* Put STRING, which is of the form "NAME=VALUE", in the environment. */
int
-DEFUN(putenv, (string), CONST char *string)
+putenv (string)
+ const char *string;
{
{
-
CONST char *CONST name_end = strchr
(string, '=');
+
const char *const name_end = strchr
(string, '=');
register size_t size;
register char **ep;
if (name_end == NULL)
{
/* Remove the variable from the environment. */
register size_t size;
register char **ep;
if (name_end == NULL)
{
/* Remove the variable from the environment. */
- size = strlen(string);
- for (ep =
__
environ; *ep != NULL; ++ep)
- if (!strncmp(*ep, string, size) && (*ep)[size] == '=')
+ size = strlen
(string);
+ for (ep = environ; *ep != NULL; ++ep)
+ if (!strncmp
(*ep, string, size) && (*ep)[size] == '=')
{
while (ep[1] != NULL)
{
{
while (ep[1] != NULL)
{
@@
-53,8
+81,8
@@
DEFUN(putenv, (string), CONST char *string)
}
size = 0;
}
size = 0;
- for (ep =
__
environ; *ep != NULL; ++ep)
- if (!strncmp(*ep, string, name_end - string) &&
+ for (ep = environ; *ep != NULL; ++ep)
+ if (!strncmp
(*ep, string, name_end - string) &&
(*ep)[name_end - string] == '=')
break;
else
(*ep)[name_end - string] == '=')
break;
else
@@
-63,16
+91,17
@@
DEFUN(putenv, (string), CONST char *string)
if (*ep == NULL)
{
static char **last_environ = NULL;
if (*ep == NULL)
{
static char **last_environ = NULL;
- char **new_environ = (char **) malloc
((size + 2) * sizeof
(char *));
+ char **new_environ = (char **) malloc
((size + 2) * sizeof
(char *));
if (new_environ == NULL)
return -1;
if (new_environ == NULL)
return -1;
- (void) memcpy((PTR) new_environ, (PTR) __environ, size * sizeof(char *));
+ (void) memcpy ((void *) new_environ, (void *) 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)
- free
((PTR
) last_environ);
+ free
((void *
) last_environ);
last_environ = new_environ;
last_environ = new_environ;
-
__
environ = new_environ;
+ environ = new_environ;
}
else
*ep = (char *) string;
}
else
*ep = (char *) string;