Add a symbol's value to the computed frag offset, rather than overwriting it.

[deliverable/binutils-gdb.git] / gdb / environ.c

diff --git a/gdb/environ.c b/gdb/environ.c
index 45767e50536581ab96c24da3a88c35e3f36bec8b..c4a5adc375489dcc8a6030c7fed8bd95050c32ec 100644 (file)
--- a/gdb/environ.c
+++ b/gdb/environ.c
@@ -3,8 +3,8 @@
 
    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.
+   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
@@ -13,18 +13,18 @@
 
    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.  */
+   Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, 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>
-
-extern char *xmalloc ();
-extern char *xrealloc ();
-extern void free ();
+#include "gdb_string.h"
+#include "gdbcore.h"
 \f
+
 /* Return a new environment object.  */
 
 struct environ *
@@ -65,22 +65,25 @@ init_environ (e)
   extern char **environ;
   register 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 *));
     }
 
-  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;
     }
 }
@@ -99,16 +102,15 @@ environ_vector (e)
 
 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;
@@ -119,17 +121,16 @@ get_in_environ (e, var)
 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)
@@ -137,7 +138,7 @@ 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;
        }
@@ -152,15 +153,16 @@ 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;
 }
 
@@ -175,14 +177,19 @@ unset_in_environ (e, var)
   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;
+       }
+    }
 }