* infptrace.c (child_resume): Don't try to step if

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

diff --git a/gdb/environ.c b/gdb/environ.c
index bdc784a2e391a09761ce07d7fd599376d27fde41..193f34de53afaf6c4b75c07814f3719ce641c680 100644 (file)
--- a/gdb/environ.c
+++ b/gdb/environ.c
@@ -20,8 +20,8 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 #include "defs.h"
 #include "environ.h"
-#include <string.h>
-#include "defs.h" /* For strsave().  */
+#include "gdb_string.h"
+#include "gdbcore.h"
 
 \f
 /* Return a new environment object.  */
@@ -64,6 +64,9 @@ init_environ (e)
   extern char **environ;
   register int i;
 
+  if (environ == NULL)
+    return;
+
   for (i = 0; environ[i]; i++) /*EMPTY*/;
 
   if (e->allocated < i)
@@ -73,13 +76,13 @@ init_environ (e)
                                      (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);
+      memcpy (new, e->vector[i], len + 1);
       e->vector[i] = new;
     }
 }
@@ -106,8 +109,7 @@ get_in_environ (e, var)
   register char *s;
 
   for (; (s = *vector) != NULL; vector++)
-    if (!strncmp (s, var, len)
-       && s[len] == '=')
+    if (STREQN (s, var, len) && s[len] == '=')
       return &s[len + 1];
 
   return 0;
@@ -127,8 +129,7 @@ set_in_environ (e, var, value)
   register char *s;
 
   for (i = 0; (s = vector[i]) != NULL; i++)
-    if (!strncmp (s, var, len)
-       && s[len] == '=')
+    if (STREQN (s, var, len) && s[len] == '=')
       break;
 
   if (s == 0)
@@ -151,15 +152,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,13 +177,18 @@ unset_in_environ (e, var)
   register 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 (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;
+       }
+    }
 }