Factor out "Detaching from program" message printing

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

diff --git a/gdb/environ.c b/gdb/environ.c
index a752d57ad6738217750580a868a7de28d243b7e9..9557cefabb21a343165cb5e1bf77c37b01ef8464 100644 (file)
--- a/gdb/environ.c
+++ b/gdb/environ.c
@@ -1,11 +1,10 @@
 /* environ.c -- library for manipulating environments for GNU.
 
-   Copyright (C) 1986, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 2000, 2005
-   2003, 2007 Free Software Foundation, Inc.
+   Copyright (C) 1986-2016 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 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,
@@ -14,16 +13,13 @@
    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., 51 Franklin Street, Fifth Floor,
-   Boston, MA 02110-1301, 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))
 
 #include "defs.h"
 #include "environ.h"
-#include "gdb_string.h"
 \f
 
 /* Return a new environment object.  */
@@ -33,7 +29,7 @@ make_environ (void)
 {
   struct gdb_environ *e;
 
-  e = (struct gdb_environ *) xmalloc (sizeof (struct gdb_environ));
+  e = XNEW (struct gdb_environ);
 
   e->allocated = 10;
   e->vector = (char **) xmalloc ((e->allocated + 1) * sizeof (char *));
@@ -51,6 +47,7 @@ free_environ (struct gdb_environ *e)
   while (*vector)
     xfree (*vector++);
 
+  xfree (e->vector);
   xfree (e);
 }
 
@@ -81,9 +78,10 @@ init_environ (struct gdb_environ *e)
   while (--i >= 0)
     {
       int len = strlen (e->vector[i]);
-      char *new = (char *) xmalloc (len + 1);
-      memcpy (new, e->vector[i], len + 1);
-      e->vector[i] = new;
+      char *newobj = (char *) xmalloc (len + 1);
+
+      memcpy (newobj, e->vector[i], len + 1);
+      e->vector[i] = newobj;
     }
 }
 
@@ -162,7 +160,7 @@ set_in_environ (struct gdb_environ *e, const char *var, const char *value)
 /* Remove the setting for variable VAR from environment E.  */
 
 void
-unset_in_environ (struct gdb_environ *e, char *var)
+unset_in_environ (struct gdb_environ *e, const char *var)
 {
   int len = strlen (var);
   char **vector = e->vector;
@@ -175,7 +173,7 @@ unset_in_environ (struct gdb_environ *e, char *var)
          xfree (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. */
+            overlap, and memmove() might not be available.  */
          while ((vector[0] = vector[1]) != NULL)
            {
              vector++;