* gdbarch.sh: Document the return_value method. Explain that

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

diff --git a/gdb/environ.c b/gdb/environ.c
index b62938851b91a53257302609680971af8ef93884..ee471adc664173b7e21b89a73cb2355835f90e46 100644 (file)
--- a/gdb/environ.c
+++ b/gdb/environ.c
@@ -1,11 +1,11 @@
 /* environ.c -- library for manipulating environments for GNU.
 
 /* environ.c -- library for manipulating environments for GNU.
 

-   Copyright 1986, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 2000,
-   2003 Free Software Foundation, Inc.
+   Copyright (C) 1986, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 2000, 2005
+   2003, 2007, 2008 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,


@@ -14,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))


@@ -28,12 +26,12 @@
 
 /* Return a new environment object.  */
 
 
 /* Return a new environment object.  */
 

-struct environ *
+struct gdb_environ *

 make_environ (void)
 {
 make_environ (void)
 {

-  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 *));


@@ -44,7 +42,7 @@ 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 (struct environ *e)
+free_environ (struct gdb_environ *e)

 {
   char **vector = e->vector;
 
 {
   char **vector = e->vector;
 


@@ -59,7 +57,7 @@ free_environ (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 (struct environ *e)
+init_environ (struct gdb_environ *e)

 {
   extern char **environ;
   int i;
 {
   extern char **environ;
   int i;


@@ -91,7 +89,7 @@ init_environ (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;
 }


@@ -99,7 +97,7 @@ 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)

 {
   int len = strlen (var);
   char **vector = e->vector;
 {
   int len = strlen (var);
   char **vector = e->vector;


@@ -115,7 +113,7 @@ 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)

 {
   int i;
   int len = strlen (var);
 {
   int i;
   int len = strlen (var);


@@ -162,7 +160,7 @@ 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)

 {
   int len = strlen (var);
   char **vector = e->vector;
 {
   int len = strlen (var);
   char **vector = e->vector;


@@ -170,7 +168,7 @@ unset_in_environ (struct environ *e, char *var)
 
   for (; (s = *vector) != NULL; vector++)
     {
 
   for (; (s = *vector) != NULL; vector++)
     {

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

        {
          xfree (s);
          /* Walk through the vector, shuffling args down by one, including
        {
          xfree (s);
          /* Walk through the vector, shuffling args down by one, including