projects
/
deliverable
/
binutils-gdb.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
x86-64: Properly encode and decode movsxd
[deliverable/binutils-gdb.git]
/
libiberty
/
setenv.c
diff --git
a/libiberty/setenv.c
b/libiberty/setenv.c
index 35f2a314e87ddf7199549f91d5eb2e8c842334e0..82bf1b83600fae86c7f9eee99fffaf7bfc157ef3 100644
(file)
--- a/
libiberty/setenv.c
+++ b/
libiberty/setenv.c
@@
-1,4
+1,4
@@
-/* Copyright (C) 1992
, 1995, 1996, 1997, 2002
Free Software Foundation, Inc.
+/* Copyright (C) 1992
-2020
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,13
+13,14
@@
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. */
/*
/*
-@deftypefn Supplemental int setenv (const char *@var{name}, const char *@var{value}, int @var{overwrite})
+@deftypefn Supplemental int setenv (const char *@var{name}, @
+ const char *@var{value}, int @var{overwrite})
@deftypefnx Supplemental void unsetenv (const char *@var{name})
@code{setenv} adds @var{name} to the environment with value
@deftypefnx Supplemental void unsetenv (const char *@var{name})
@code{setenv} adds @var{name} to the environment with value
@@
-60,9
+61,7
@@
extern int errno;
#endif
#define __environ environ
#endif
#define __environ environ
-#ifndef HAVE_ENVIRON_DECL
-extern char **environ;
-#endif
+#include "environ.h"
#undef setenv
#undef unsetenv
#undef setenv
#undef unsetenv
@@
-115,7
+114,7
@@
setenv (const char *name, const char *value, int 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);
@@
-142,13
+141,13
@@
setenv (const char *name, const char *value, int 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] = '=';
This page took
0.024387 seconds
and
4
git commands to generate.