/* 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 1, or (at your option)
- any later version.
+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.
- 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 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, write to the Free Software
- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
+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. */
#define min(a, b) ((a) < (b) ? (a) : (b))
#define max(a, b) ((a) > (b) ? (a) : (b))
+#include "defs.h"
#include "environ.h"
#include <string.h>
+#include "defs.h" /* For strsave(). */
-extern char *xmalloc ();
-extern char *xrealloc ();
-extern void free ();
\f
/* Return a new environment object. */
(e->allocated + 1) * sizeof (char *));
}
- bcopy (environ, e->vector, (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);
- bcopy (e->vector[i], new, len + 1);
+ memcpy (new, e->vector[i], len + 1);
e->vector[i] = new;
}
}
char *
get_in_environ (e, var)
- struct environ *e;
- char *var;
+ const struct environ *e;
+ const char *var;
{
register int len = strlen (var);
register char **vector = e->vector;
register char *s;
- for (; s = *vector; vector++)
- if (!strncmp (s, var, len)
- && s[len] == '=')
+ for (; (s = *vector) != NULL; vector++)
+ if (STREQN (s, var, len) && s[len] == '=')
return &s[len + 1];
return 0;
void
set_in_environ (e, var, value)
struct environ *e;
- char *var;
- char *value;
+ const char *var;
+ const char *value;
{
register int i;
register int len = strlen (var);
register char **vector = e->vector;
register char *s;
- for (i = 0; s = vector[i]; i++)
- if (!strncmp (s, var, len)
- && s[len] == '=')
+ for (i = 0; (s = vector[i]) != NULL; i++)
+ if (STREQN (s, var, len) && s[len] == '=')
break;
if (s == 0)
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));
- }
+ environment, too. FIXME: this is a hideous hack and should not be
+ allowed to live. What if we want to change the environment we pass to
+ the program without affecting GDB's behavior? */
+ if (STREQ(var, "PATH") /* Object file location */
+ || STREQ (var, "G960BASE") /* Intel 960 downloads */
+ || STREQ (var, "G960BIN") /* Intel 960 downloads */
+ )
+ {
+ putenv (strsave (s));
+ }
+
+ /* This is a compatibility hack, since GDB 4.10 and older didn't have
+ `set gnutarget'. Eventually it should go away, so that (for example)
+ you can debug objdump's handling of GNUTARGET without affecting GDB's
+ behavior. */
+ if (STREQ (var, "GNUTARGET"))
+ {
+ set_gnutarget (value);
+ }
return;
}
register char **vector = e->vector;
register char *s;
- for (; s = *vector; vector++)
- if (!strncmp (s, var, len)
- && s[len] == '=')
- {
- free (s);
- bcopy (vector + 1, vector,
- (e->allocated - (vector - e->vector)) * sizeof (char *));
- e->vector[e->allocated - 1] = 0;
- return;
- }
+ for (; (s = *vector) != NULL; vector++)
+ {
+ if (STREQN (s, var, len) && s[len] == '=')
+ {
+ free (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;
+ }
+ }
}