X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=gdb%2Fenviron.c;h=ee471adc664173b7e21b89a73cb2355835f90e46;hb=c14c28ba117dee9fd0bf17fc3437e808221a7829;hp=bdc784a2e391a09761ce07d7fd599376d27fde41;hpb=51b57ded888cbdacb5ad126363f8ae6adc9541b6;p=deliverable%2Fbinutils-gdb.git
diff --git a/gdb/environ.c b/gdb/environ.c
index bdc784a2e3..ee471adc66 100644
--- a/gdb/environ.c
+++ b/gdb/environ.c
@@ -1,37 +1,37 @@
/* environ.c -- library for manipulating environments for GNU.
- Copyright (C) 1986, 1989 Free Software Foundation, Inc.
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
+ Copyright (C) 1986, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 2000, 2005
+ 2003, 2007, 2008 Free Software Foundation, Inc.
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 3 of the License, or
+ (at your option) any later version.
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see . */
#define min(a, b) ((a) < (b) ? (a) : (b))
#define max(a, b) ((a) > (b) ? (a) : (b))
#include "defs.h"
#include "environ.h"
-#include
-#include "defs.h" /* For strsave(). */
-
+#include "gdb_string.h"
+
/* Return a new environment object. */
-struct environ *
-make_environ ()
+struct gdb_environ *
+make_environ (void)
{
- register struct environ *e;
+ struct gdb_environ *e;
- e = (struct environ *) xmalloc (sizeof (struct environ));
+ e = (struct gdb_environ *) xmalloc (sizeof (struct gdb_environ));
e->allocated = 10;
e->vector = (char **) xmalloc ((e->allocated + 1) * sizeof (char *));
@@ -42,15 +42,14 @@ make_environ ()
/* Free an environment and all the strings in it. */
void
-free_environ (e)
- register struct environ *e;
+free_environ (struct gdb_environ *e)
{
- register char **vector = e->vector;
+ char **vector = e->vector;
while (*vector)
- free (*vector++);
+ xfree (*vector++);
- free (e);
+ xfree (e);
}
/* Copy the environment given to this process into E.
@@ -58,28 +57,30 @@ free_environ (e)
that all strings in these environments are safe to free. */
void
-init_environ (e)
- register struct environ *e;
+init_environ (struct gdb_environ *e)
{
extern char **environ;
- register int i;
+ int i;
- for (i = 0; environ[i]; i++) /*EMPTY*/;
+ if (environ == NULL)
+ return;
+
+ for (i = 0; environ[i]; i++) /*EMPTY */ ;
if (e->allocated < i)
{
e->allocated = max (i, e->allocated + 10);
- e->vector = (char **) xrealloc ((char *)e->vector,
+ e->vector = (char **) xrealloc ((char *) e->vector,
(e->allocated + 1) * sizeof (char *));
}
- (void) memcpy (e->vector, environ, (i + 1) * sizeof (char *));
+ memcpy (e->vector, environ, (i + 1) * sizeof (char *));
while (--i >= 0)
{
- register int len = strlen (e->vector[i]);
- register char *new = (char *) xmalloc (len + 1);
- (void) memcpy (new, e->vector[i], len + 1);
+ int len = strlen (e->vector[i]);
+ char *new = (char *) xmalloc (len + 1);
+ memcpy (new, e->vector[i], len + 1);
e->vector[i] = new;
}
}
@@ -88,8 +89,7 @@ init_environ (e)
This is used to get something to pass to execve. */
char **
-environ_vector (e)
- struct environ *e;
+environ_vector (struct gdb_environ *e)
{
return e->vector;
}
@@ -97,17 +97,14 @@ environ_vector (e)
/* Return the value in environment E of variable VAR. */
char *
-get_in_environ (e, var)
- const struct environ *e;
- const char *var;
+get_in_environ (const struct gdb_environ *e, const char *var)
{
- register int len = strlen (var);
- register char **vector = e->vector;
- register char *s;
+ int len = strlen (var);
+ char **vector = e->vector;
+ char *s;
for (; (s = *vector) != NULL; vector++)
- if (!strncmp (s, var, len)
- && s[len] == '=')
+ if (strncmp (s, var, len) == 0 && s[len] == '=')
return &s[len + 1];
return 0;
@@ -116,19 +113,15 @@ get_in_environ (e, var)
/* Store the value in E of VAR as VALUE. */
void
-set_in_environ (e, var, value)
- struct environ *e;
- const char *var;
- const char *value;
+set_in_environ (struct gdb_environ *e, const char *var, const char *value)
{
- register int i;
- register int len = strlen (var);
- register char **vector = e->vector;
- register char *s;
+ int i;
+ int len = strlen (var);
+ char **vector = e->vector;
+ char *s;
for (i = 0; (s = vector[i]) != NULL; i++)
- if (!strncmp (s, var, len)
- && s[len] == '=')
+ if (strncmp (s, var, len) == 0 && s[len] == '=')
break;
if (s == 0)
@@ -136,14 +129,14 @@ set_in_environ (e, var, value)
if (i == e->allocated)
{
e->allocated += 10;
- vector = (char **) xrealloc ((char *)vector,
+ vector = (char **) xrealloc ((char *) vector,
(e->allocated + 1) * sizeof (char *));
e->vector = vector;
}
vector[i + 1] = 0;
}
else
- free (s);
+ xfree (s);
s = (char *) xmalloc (len + strlen (value) + 2);
strcpy (s, var);
@@ -151,37 +144,41 @@ set_in_environ (e, var, value)
strcat (s, value);
vector[i] = s;
- /* Certain variables get exported back to the parent (e.g. our)
- environment, too. */
- if (!strcmp(var, "PATH") /* Object file location */
- || !strcmp (var, "G960BASE") /* Intel 960 downloads */
- || !strcmp (var, "G960BIN") /* Intel 960 downloads */
- || !strcmp (var, "GNUTARGET") /* BFD object file type */
- ) {
- putenv (strsave (s));
- }
+ /* This used to handle setting the PATH and GNUTARGET variables
+ specially. The latter has been replaced by "set gnutarget"
+ (which has worked since GDB 4.11). The former affects searching
+ the PATH to find SHELL, and searching the PATH to find the
+ argument of "symbol-file" or "exec-file". Maybe we should have
+ some kind of "set exec-path" for that. But in any event, having
+ "set env" affect anything besides the inferior is a bad idea.
+ What if we want to change the environment we pass to the program
+ without afecting GDB's behavior? */
+
return;
}
/* Remove the setting for variable VAR from environment E. */
void
-unset_in_environ (e, var)
- struct environ *e;
- char *var;
+unset_in_environ (struct gdb_environ *e, char *var)
{
- register int len = strlen (var);
- register char **vector = e->vector;
- register char *s;
+ int len = strlen (var);
+ char **vector = e->vector;
+ char *s;
for (; (s = *vector) != NULL; vector++)
- if (!strncmp (s, var, len)
- && s[len] == '=')
- {
- free (s);
- (void) memcpy (vector, vector + 1,
- (e->allocated - (vector - e->vector)) * sizeof (char *));
- e->vector[e->allocated - 1] = 0;
- return;
- }
+ {
+ if (strncmp (s, var, len) == 0 && s[len] == '=')
+ {
+ xfree (s);
+ /* Walk through the vector, shuffling args down by one, including
+ the NULL terminator. Can't use memcpy() here since the regions
+ overlap, and memmove() might not be available. */
+ while ((vector[0] = vector[1]) != NULL)
+ {
+ vector++;
+ }
+ break;
+ }
+ }
}