X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gdb%2Fenviron.c;h=50653dafdc71fb155bf7a8e7b59e652a3f3d6ce9;hb=1abaf0423f9c1391c193baa0f54445a1b5367ab6;hp=77296bef2a41d0a949106df58b78dc69a440f99b;hpb=5b64ad42d36e6d487e1f7287d37fbc243a178e72;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/environ.c b/gdb/environ.c index 77296bef2a..50653dafdc 100644 --- a/gdb/environ.c +++ b/gdb/environ.c @@ -1,19 +1,19 @@ /* environ.c -- library for manipulating environments for GNU. - Copyright (C) 1986, 1989 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 -(at your option) any later version. + Copyright (C) 1986-2013 Free Software Foundation, Inc. -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. + 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 3 of the License, or + (at your option) any later version. -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. */ + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + 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, see . */ #define min(a, b) ((a) < (b) ? (a) : (b)) #define max(a, b) ((a) > (b) ? (a) : (b)) @@ -21,17 +21,16 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #include "defs.h" #include "environ.h" #include "gdb_string.h" -#include "gdbcore.h" - + /* Return a new environment object. */ -struct environ * -make_environ () +struct gdb_environ * +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 *)); @@ -42,15 +41,15 @@ make_environ () /* Free an environment and all the strings in it. */ void -free_environ (e) - register struct environ *e; +free_environ (struct gdb_environ *e) { - register char **vector = e->vector; + char **vector = e->vector; while (*vector) - free (*vector++); + xfree (*vector++); - free (e); + xfree (e->vector); + xfree (e); } /* Copy the environment given to this process into E. @@ -58,21 +57,20 @@ free_environ (e) that all strings in these environments are safe to free. */ void -init_environ (e) - register struct environ *e; +init_environ (struct gdb_environ *e) { extern char **environ; - register int i; + int i; if (environ == NULL) return; - for (i = 0; environ[i]; i++) /*EMPTY*/; + 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 *)); } @@ -80,8 +78,9 @@ init_environ (e) 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; } @@ -91,8 +90,7 @@ init_environ (e) This is used to get something to pass to execve. */ char ** -environ_vector (e) - struct environ *e; +environ_vector (struct gdb_environ *e) { return e->vector; } @@ -100,16 +98,14 @@ environ_vector (e) /* Return the value in environment E of variable VAR. */ char * -get_in_environ (e, var) - 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++) - if (STREQN (s, var, len) && s[len] == '=') + if (strncmp (s, var, len) == 0 && s[len] == '=') return &s[len + 1]; return 0; @@ -118,18 +114,15 @@ get_in_environ (e, var) /* Store the value in E of VAR as VALUE. */ void -set_in_environ (e, var, value) - 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++) - if (STREQN (s, var, len) && s[len] == '=') + if (strncmp (s, var, len) == 0 && s[len] == '=') break; if (s == 0) @@ -137,14 +130,14 @@ 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; } vector[i + 1] = 0; } else - free (s); + xfree (s); s = (char *) xmalloc (len + strlen (value) + 2); strcpy (s, var); @@ -168,22 +161,20 @@ set_in_environ (e, var, value) /* Remove the setting for variable VAR from environment E. */ void -unset_in_environ (e, var) - 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++) { - 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 - overlap, and memmove() might not be available. */ + overlap, and memmove() might not be available. */ while ((vector[0] = vector[1]) != NULL) { vector++;