From 1672e0d98d88d11b5c7d5793bd2cf29cbb56696f Mon Sep 17 00:00:00 2001 From: Sergio Durigan Junior Date: Thu, 22 Dec 2016 09:20:00 -0500 Subject: Share gdb/environ.[ch] with gdbserver We will need access to the environment functions when we share fork_inferior between GDB and gdbserver, therefore we simply make the API on gdb/environ.[ch] available on common/. No extra adjustments are needed to make it compile on gdbserver. gdb/ChangeLog: 2017-03-07 Sergio Durigan Junior * Makefile.in (SFILES): Replace "environ.c" with "common/environ.c". (HFILES_NO_SRCDIR): Likewise, for "environ.h". * environ.c: Include "common-defs.h" instead of "defs.h. Moved to... * common/environ.c: ... here. * environ.h: Moved to... * common/environ.h: ... here. gdb/gdbserver/ChangeLog: 2017-03-07 Sergio Durigan Junior * Makefile.in (SFILES): Add "common/environ.c". (OBJS): Add "common/environ.h". --- gdb/ChangeLog | 11 +++ gdb/Makefile.in | 4 +- gdb/common/environ.c | 182 ++++++++++++++++++++++++++++++++++++++++++++++ gdb/common/environ.h | 49 +++++++++++++ gdb/environ.c | 182 ---------------------------------------------- gdb/environ.h | 49 ------------- gdb/gdbserver/ChangeLog | 5 ++ gdb/gdbserver/Makefile.in | 5 ++ 8 files changed, 254 insertions(+), 233 deletions(-) create mode 100644 gdb/common/environ.c create mode 100644 gdb/common/environ.h delete mode 100644 gdb/environ.c delete mode 100644 gdb/environ.h (limited to 'gdb') diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 2427b10..3a156ad 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,14 @@ +2017-03-07 Sergio Durigan Junior + + * Makefile.in (SFILES): Replace "environ.c" with + "common/environ.c". + (HFILES_NO_SRCDIR): Likewise, for "environ.h". + * environ.c: Include "common-defs.h" instead of "defs.h. Moved + to... + * common/environ.c: ... here. + * environ.h: Moved to... + * common/environ.h: ... here. + 2017-03-07 Peter Bergner * gdbarch.sh (pstring_ptr): New static function. diff --git a/gdb/Makefile.in b/gdb/Makefile.in index 268c2c6..0818742 100644 --- a/gdb/Makefile.in +++ b/gdb/Makefile.in @@ -1061,7 +1061,6 @@ SFILES = \ dwarf2loc.c \ dwarf2read.c \ elfread.c \ - environ.c \ eval.c \ event-loop.c \ event-top.c \ @@ -1207,6 +1206,7 @@ SFILES = \ common/common-regcache.c \ common/common-utils.c \ common/errors.c \ + common/environ.c \ common/fileio.c \ common/filestuff.c \ common/format.c \ @@ -1285,7 +1285,6 @@ HFILES_NO_SRCDIR = \ dwarf2-frame-tailcall.h \ dwarf2expr.h \ dwarf2loc.h \ - environ.h \ event-loop.h \ event-top.h \ exceptions.h \ @@ -1486,6 +1485,7 @@ HFILES_NO_SRCDIR = \ common/common-types.h \ common/common-utils.h \ common/errors.h \ + common/environ.h \ common/fileio.h \ common/format.h \ common/gdb_assert.h \ diff --git a/gdb/common/environ.c b/gdb/common/environ.c new file mode 100644 index 0000000..3145d01 --- /dev/null +++ b/gdb/common/environ.c @@ -0,0 +1,182 @@ +/* environ.c -- library for manipulating environments for GNU. + + Copyright (C) 1986-2017 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 3 of the License, or + (at your option) any later version. + + 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 . */ + +#include "common-defs.h" +#include "environ.h" +#include + + +/* Return a new environment object. */ + +struct gdb_environ * +make_environ (void) +{ + struct gdb_environ *e; + + e = XNEW (struct gdb_environ); + + e->allocated = 10; + e->vector = (char **) xmalloc ((e->allocated + 1) * sizeof (char *)); + e->vector[0] = 0; + return e; +} + +/* Free an environment and all the strings in it. */ + +void +free_environ (struct gdb_environ *e) +{ + char **vector = e->vector; + + while (*vector) + xfree (*vector++); + + xfree (e->vector); + xfree (e); +} + +/* Copy the environment given to this process into E. + Also copies all the strings in it, so we can be sure + that all strings in these environments are safe to free. */ + +void +init_environ (struct gdb_environ *e) +{ + extern char **environ; + int i; + + if (environ == NULL) + return; + + for (i = 0; environ[i]; i++) /*EMPTY */ ; + + if (e->allocated < i) + { + e->allocated = std::max (i, e->allocated + 10); + e->vector = (char **) xrealloc ((char *) e->vector, + (e->allocated + 1) * sizeof (char *)); + } + + memcpy (e->vector, environ, (i + 1) * sizeof (char *)); + + while (--i >= 0) + { + int len = strlen (e->vector[i]); + char *newobj = (char *) xmalloc (len + 1); + + memcpy (newobj, e->vector[i], len + 1); + e->vector[i] = newobj; + } +} + +/* Return the vector of environment E. + This is used to get something to pass to execve. */ + +char ** +environ_vector (struct gdb_environ *e) +{ + return e->vector; +} + +/* Return the value in environment E of variable VAR. */ + +char * +get_in_environ (const struct gdb_environ *e, const char *var) +{ + int len = strlen (var); + char **vector = e->vector; + char *s; + + for (; (s = *vector) != NULL; vector++) + if (strncmp (s, var, len) == 0 && s[len] == '=') + return &s[len + 1]; + + return 0; +} + +/* Store the value in E of VAR as VALUE. */ + +void +set_in_environ (struct gdb_environ *e, const char *var, const char *value) +{ + int i; + int len = strlen (var); + char **vector = e->vector; + char *s; + + for (i = 0; (s = vector[i]) != NULL; i++) + if (strncmp (s, var, len) == 0 && s[len] == '=') + break; + + if (s == 0) + { + if (i == e->allocated) + { + e->allocated += 10; + vector = (char **) xrealloc ((char *) vector, + (e->allocated + 1) * sizeof (char *)); + e->vector = vector; + } + vector[i + 1] = 0; + } + else + xfree (s); + + s = (char *) xmalloc (len + strlen (value) + 2); + strcpy (s, var); + strcat (s, "="); + strcat (s, value); + vector[i] = 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; +} + +/* Remove the setting for variable VAR from environment E. */ + +void +unset_in_environ (struct gdb_environ *e, const char *var) +{ + int len = strlen (var); + char **vector = e->vector; + char *s; + + for (; (s = *vector) != NULL; vector++) + { + if (strncmp (s, var, len) == 0 && s[len] == '=') + { + 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. */ + while ((vector[0] = vector[1]) != NULL) + { + vector++; + } + break; + } + } +} diff --git a/gdb/common/environ.h b/gdb/common/environ.h new file mode 100644 index 0000000..3ace69e --- /dev/null +++ b/gdb/common/environ.h @@ -0,0 +1,49 @@ +/* Header for environment manipulation library. + Copyright (C) 1989-2017 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 3 of the License, or + (at your option) any later version. + + 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 . */ + +#if !defined (ENVIRON_H) +#define ENVIRON_H 1 + +/* We manipulate environments represented as these structures. */ + +struct gdb_environ + { + /* Number of usable slots allocated in VECTOR. + VECTOR always has one slot not counted here, + to hold the terminating zero. */ + int allocated; + /* A vector of slots, ALLOCATED + 1 of them. + The first few slots contain strings "VAR=VALUE" + and the next one contains zero. + Then come some unused slots. */ + char **vector; + }; + +extern struct gdb_environ *make_environ (void); + +extern void free_environ (struct gdb_environ *); + +extern void init_environ (struct gdb_environ *); + +extern char *get_in_environ (const struct gdb_environ *, const char *); + +extern void set_in_environ (struct gdb_environ *, const char *, const char *); + +extern void unset_in_environ (struct gdb_environ *, const char *); + +extern char **environ_vector (struct gdb_environ *); + +#endif /* defined (ENVIRON_H) */ diff --git a/gdb/environ.c b/gdb/environ.c deleted file mode 100644 index bfeabec..0000000 --- a/gdb/environ.c +++ /dev/null @@ -1,182 +0,0 @@ -/* environ.c -- library for manipulating environments for GNU. - - Copyright (C) 1986-2017 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 3 of the License, or - (at your option) any later version. - - 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 . */ - -#include "defs.h" -#include "environ.h" -#include - - -/* Return a new environment object. */ - -struct gdb_environ * -make_environ (void) -{ - struct gdb_environ *e; - - e = XNEW (struct gdb_environ); - - e->allocated = 10; - e->vector = (char **) xmalloc ((e->allocated + 1) * sizeof (char *)); - e->vector[0] = 0; - return e; -} - -/* Free an environment and all the strings in it. */ - -void -free_environ (struct gdb_environ *e) -{ - char **vector = e->vector; - - while (*vector) - xfree (*vector++); - - xfree (e->vector); - xfree (e); -} - -/* Copy the environment given to this process into E. - Also copies all the strings in it, so we can be sure - that all strings in these environments are safe to free. */ - -void -init_environ (struct gdb_environ *e) -{ - extern char **environ; - int i; - - if (environ == NULL) - return; - - for (i = 0; environ[i]; i++) /*EMPTY */ ; - - if (e->allocated < i) - { - e->allocated = std::max (i, e->allocated + 10); - e->vector = (char **) xrealloc ((char *) e->vector, - (e->allocated + 1) * sizeof (char *)); - } - - memcpy (e->vector, environ, (i + 1) * sizeof (char *)); - - while (--i >= 0) - { - int len = strlen (e->vector[i]); - char *newobj = (char *) xmalloc (len + 1); - - memcpy (newobj, e->vector[i], len + 1); - e->vector[i] = newobj; - } -} - -/* Return the vector of environment E. - This is used to get something to pass to execve. */ - -char ** -environ_vector (struct gdb_environ *e) -{ - return e->vector; -} - -/* Return the value in environment E of variable VAR. */ - -char * -get_in_environ (const struct gdb_environ *e, const char *var) -{ - int len = strlen (var); - char **vector = e->vector; - char *s; - - for (; (s = *vector) != NULL; vector++) - if (strncmp (s, var, len) == 0 && s[len] == '=') - return &s[len + 1]; - - return 0; -} - -/* Store the value in E of VAR as VALUE. */ - -void -set_in_environ (struct gdb_environ *e, const char *var, const char *value) -{ - int i; - int len = strlen (var); - char **vector = e->vector; - char *s; - - for (i = 0; (s = vector[i]) != NULL; i++) - if (strncmp (s, var, len) == 0 && s[len] == '=') - break; - - if (s == 0) - { - if (i == e->allocated) - { - e->allocated += 10; - vector = (char **) xrealloc ((char *) vector, - (e->allocated + 1) * sizeof (char *)); - e->vector = vector; - } - vector[i + 1] = 0; - } - else - xfree (s); - - s = (char *) xmalloc (len + strlen (value) + 2); - strcpy (s, var); - strcat (s, "="); - strcat (s, value); - vector[i] = 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; -} - -/* Remove the setting for variable VAR from environment E. */ - -void -unset_in_environ (struct gdb_environ *e, const char *var) -{ - int len = strlen (var); - char **vector = e->vector; - char *s; - - for (; (s = *vector) != NULL; vector++) - { - if (strncmp (s, var, len) == 0 && s[len] == '=') - { - 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. */ - while ((vector[0] = vector[1]) != NULL) - { - vector++; - } - break; - } - } -} diff --git a/gdb/environ.h b/gdb/environ.h deleted file mode 100644 index 3ace69e..0000000 --- a/gdb/environ.h +++ /dev/null @@ -1,49 +0,0 @@ -/* Header for environment manipulation library. - Copyright (C) 1989-2017 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 3 of the License, or - (at your option) any later version. - - 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 . */ - -#if !defined (ENVIRON_H) -#define ENVIRON_H 1 - -/* We manipulate environments represented as these structures. */ - -struct gdb_environ - { - /* Number of usable slots allocated in VECTOR. - VECTOR always has one slot not counted here, - to hold the terminating zero. */ - int allocated; - /* A vector of slots, ALLOCATED + 1 of them. - The first few slots contain strings "VAR=VALUE" - and the next one contains zero. - Then come some unused slots. */ - char **vector; - }; - -extern struct gdb_environ *make_environ (void); - -extern void free_environ (struct gdb_environ *); - -extern void init_environ (struct gdb_environ *); - -extern char *get_in_environ (const struct gdb_environ *, const char *); - -extern void set_in_environ (struct gdb_environ *, const char *, const char *); - -extern void unset_in_environ (struct gdb_environ *, const char *); - -extern char **environ_vector (struct gdb_environ *); - -#endif /* defined (ENVIRON_H) */ diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog index 79fe2f9..a3e60f8 100644 --- a/gdb/gdbserver/ChangeLog +++ b/gdb/gdbserver/ChangeLog @@ -1,3 +1,8 @@ +2017-03-07 Sergio Durigan Junior + + * Makefile.in (SFILES): Add "common/environ.c". + (OBJS): Add "common/environ.h". + 2017-01-27 Walfred Tedeschi * configure.ac: Check if the fs_base and gs_base members of diff --git a/gdb/gdbserver/Makefile.in b/gdb/gdbserver/Makefile.in index c2354d2..1cccbbf 100644 --- a/gdb/gdbserver/Makefile.in +++ b/gdb/gdbserver/Makefile.in @@ -201,6 +201,7 @@ SFILES = \ $(srcdir)/common/common-regcache.c \ $(srcdir)/common/common-utils.c \ $(srcdir)/common/errors.c \ + $(srcdir)/common/environ.c \ $(srcdir)/common/fileio.c \ $(srcdir)/common/filestuff.c \ $(srcdir)/common/gdb_vecs.c \ @@ -238,6 +239,7 @@ OBS = \ debug.o \ dll.o \ errors.o \ + environ.o \ event-loop.o \ fileio.o \ filestuff.o \ @@ -782,6 +784,9 @@ agent.o: ../common/agent.c errors.o: ../common/errors.c $(COMPILE) $< $(POSTCOMPILE) +environ.o: ../common/environ.c + $(COMPILE) $< + $(POSTCOMPILE) common-debug.o: ../common/common-debug.c $(COMPILE) $< $(POSTCOMPILE) -- cgit v1.1