projects
/
platform
/
upstream
/
binutils.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
merge from gcc
[platform/upstream/binutils.git]
/
libiberty
/
setenv.c
diff --git
a/libiberty/setenv.c
b/libiberty/setenv.c
index
79e38ed
..
355af5a
100644
(file)
--- a/
libiberty/setenv.c
+++ b/
libiberty/setenv.c
@@
-1,4
+1,4
@@
-/* Copyright (C) 1992, 1995, 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1992, 1995, 1996, 1997
, 2002
Free Software Foundation, Inc.
This file based on setenv.c in the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
This file based on setenv.c in the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@
-13,8
+13,8
@@
You should have received a copy of the GNU Library General Public
License along with the GNU C Library; see the file COPYING.LIB. If not,
You should have received a copy of the GNU Library General Public
License along with the GNU C Library; see the file COPYING.LIB. If not,
- write to the Free Software Foundation, Inc., 5
9 Temple Place - Suite 330
,
- Boston, MA 0211
1-1307
, USA. */
+ write to the Free Software Foundation, Inc., 5
1 Franklin Street - Fifth Floor
,
+ Boston, MA 0211
0-1301
, USA. */
/*
/*
@@
-36,6
+36,9
@@
environment. This implementation is not safe for multithreaded code.
# include <config.h>
#endif
# include <config.h>
#endif
+#define setenv libiberty_setenv
+#define unsetenv libiberty_unsetenv
+
#include "ansidecl.h"
#include <sys/types.h> /* For `size_t' */
#include <stdio.h> /* For `NULL' */
#include "ansidecl.h"
#include <sys/types.h> /* For `size_t' */
#include <stdio.h> /* For `NULL' */
@@
-61,6
+64,9
@@
extern int errno;
extern char **environ;
#endif
extern char **environ;
#endif
+#undef setenv
+#undef unsetenv
+
/* LOCK and UNLOCK are defined as no-ops. This makes the libiberty
* implementation MT-Unsafe. */
#define LOCK
/* LOCK and UNLOCK are defined as no-ops. This makes the libiberty
* implementation MT-Unsafe. */
#define LOCK
@@
-74,10
+80,7
@@
static char **last_environ;
int
int
-setenv (name, value, replace)
- const char *name;
- const char *value;
- int replace;
+setenv (const char *name, const char *value, int replace)
{
register char **ep = 0;
register size_t size;
{
register char **ep = 0;
register size_t size;
@@
-112,7
+115,7
@@
setenv (name, value, replace)
return -1;
}
return -1;
}
- new_environ[size] = malloc (namelen + 1 + vallen);
+ new_environ[size] =
(char *)
malloc (namelen + 1 + vallen);
if (new_environ[size] == NULL)
{
free ((char *) new_environ);
if (new_environ[size] == NULL)
{
free ((char *) new_environ);
@@
-139,13
+142,13
@@
setenv (name, value, replace)
if (len + 1 < namelen + 1 + vallen)
{
/* The existing string is too short; malloc a new one. */
if (len + 1 < namelen + 1 + vallen)
{
/* The existing string is too short; malloc a new one. */
- char *new
=
malloc (namelen + 1 + vallen);
- if (new == NULL)
+ char *new
_string = (char *)
malloc (namelen + 1 + vallen);
+ if (new
_string
== NULL)
{
UNLOCK;
return -1;
}
{
UNLOCK;
return -1;
}
- *ep = new;
+ *ep = new
_string
;
}
memcpy (*ep, name, namelen);
(*ep)[namelen] = '=';
}
memcpy (*ep, name, namelen);
(*ep)[namelen] = '=';
@@
-158,8
+161,7
@@
setenv (name, value, replace)
}
void
}
void
-unsetenv (name)
- const char *name;
+unsetenv (const char *name)
{
const size_t len = strlen (name);
char **ep;
{
const size_t len = strlen (name);
char **ep;