gdb/

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

diff --git a/gdb/environ.c b/gdb/environ.c
index 53e63e099dcb68de4ff062e478e49628486890ea..33426eb90bcb6535d874cdbbc69b9af2725a1339 100644 (file)
--- a/gdb/environ.c
+++ b/gdb/environ.c
@@ -1,9 +1,11 @@
 /* environ.c -- library for manipulating environments for GNU.
 /* environ.c -- library for manipulating environments for GNU.

-   Copyright (C) 1986, 1989 Free Software Foundation, Inc.
+
+   Copyright (C) 1986, 1989-1995, 2000, 2003, 2005, 2007-2012 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
 
    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
+   the Free Software Foundation; either version 3 of the License, or

    (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,


@@ -12,9 +14,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
    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., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */

 
 #define min(a, b) ((a) < (b) ? (a) : (b))
 #define max(a, b) ((a) > (b) ? (a) : (b))
 
 #define min(a, b) ((a) < (b) ? (a) : (b))
 #define max(a, b) ((a) > (b) ? (a) : (b))


@@ -22,17 +22,16 @@
 #include "defs.h"
 #include "environ.h"
 #include "gdb_string.h"
 #include "defs.h"
 #include "environ.h"
 #include "gdb_string.h"

-#include "gdbcore.h"

 \f
 
 /* Return a new environment object.  */
 
 \f
 
 /* Return a new environment object.  */
 

-struct environ *
+struct gdb_environ *

 make_environ (void)
 {
 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 *));
 
   e->allocated = 10;
   e->vector = (char **) xmalloc ((e->allocated + 1) * sizeof (char *));


@@ -43,14 +42,15 @@ make_environ (void)
 /* Free an environment and all the strings in it.  */
 
 void
 /* Free an environment and all the strings in it.  */
 
 void

-free_environ (register struct environ *e)
+free_environ (struct gdb_environ *e)

 {
 {

-  register char **vector = e->vector;
+  char **vector = e->vector;

 
   while (*vector)
 
   while (*vector)

-    free (*vector++);
+    xfree (*vector++);

 
 

-  free (e);
+  xfree (e->vector);
+  xfree (e);

 }
 
 /* Copy the environment given to this process into E.
 }
 
 /* Copy the environment given to this process into E.


@@ -58,10 +58,10 @@ free_environ (register struct environ *e)
    that all strings in these environments are safe to free.  */
 
 void
    that all strings in these environments are safe to free.  */
 
 void

-init_environ (register struct environ *e)
+init_environ (struct gdb_environ *e)

 {
   extern char **environ;
 {
   extern char **environ;

-  register int i;
+  int i;

 
   if (environ == NULL)
     return;
 
   if (environ == NULL)
     return;


@@ -79,8 +79,9 @@ init_environ (register struct environ *e)
 
   while (--i >= 0)
     {
 
   while (--i >= 0)
     {

-      register int len = strlen (e->vector[i]);
-      register char *new = (char *) xmalloc (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;
     }
       memcpy (new, e->vector[i], len + 1);
       e->vector[i] = new;
     }


@@ -90,7 +91,7 @@ init_environ (register struct environ *e)
    This is used to get something to pass to execve.  */
 
 char **
    This is used to get something to pass to execve.  */
 
 char **

-environ_vector (struct environ *e)
+environ_vector (struct gdb_environ *e)

 {
   return e->vector;
 }
 {
   return e->vector;
 }


@@ -98,14 +99,14 @@ environ_vector (struct environ *e)
 /* Return the value in environment E of variable VAR.  */
 
 char *
 /* Return the value in environment E of variable VAR.  */
 
 char *

-get_in_environ (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++)
 
   for (; (s = *vector) != NULL; vector++)

-    if (STREQN (s, var, len) && s[len] == '=')
+    if (strncmp (s, var, len) == 0 && s[len] == '=')

       return &s[len + 1];
 
   return 0;
       return &s[len + 1];
 
   return 0;


@@ -114,15 +115,15 @@ get_in_environ (const struct environ *e, const char *var)
 /* Store the value in E of VAR as VALUE.  */
 
 void
 /* Store the value in E of VAR as VALUE.  */
 
 void

-set_in_environ (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++)
 
   for (i = 0; (s = vector[i]) != NULL; i++)

-    if (STREQN (s, var, len) && s[len] == '=')
+    if (strncmp (s, var, len) == 0 && s[len] == '=')

       break;
 
   if (s == 0)
       break;
 
   if (s == 0)


@@ -137,7 +138,7 @@ set_in_environ (struct environ *e, const char *var, const char *value)
       vector[i + 1] = 0;
     }
   else
       vector[i + 1] = 0;
     }
   else

-    free (s);
+    xfree (s);

 
   s = (char *) xmalloc (len + strlen (value) + 2);
   strcpy (s, var);
 
   s = (char *) xmalloc (len + strlen (value) + 2);
   strcpy (s, var);


@@ -161,20 +162,20 @@ set_in_environ (struct environ *e, const char *var, const char *value)
 /* Remove the setting for variable VAR from environment E.  */
 
 void
 /* Remove the setting for variable VAR from environment E.  */
 
 void

-unset_in_environ (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++)
     {
 
   for (; (s = *vector) != NULL; vector++)
     {

-      if (STREQN (s, var, len) && s[len] == '=')
+      if (strncmp (s, var, len) == 0 && s[len] == '=')

        {
        {

-         free (s);
+         xfree (s);

          /* Walk through the vector, shuffling args down by one, including
             the NULL terminator.  Can't use memcpy() here since the regions
          /* 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. */
+            overlap, and memmove() might not be available.  */

          while ((vector[0] = vector[1]) != NULL)
            {
              vector++;
          while ((vector[0] = vector[1]) != NULL)
            {
              vector++;