mirror of
https://sourceware.org/git/binutils-gdb.git
synced 2024-12-15 04:31:49 +08:00
325fac504a
Otherwise including <string> or some other C++ header is broken. E.g.: In file included from /opt/gcc/include/c++/7.0.0/bits/char_traits.h:39:0, from /opt/gcc/include/c++/7.0.0/string:40, from /home/pedro/gdb/mygit/cxx-convertion/src/gdb/infrun.c:68: /opt/gcc/include/c++/7.0.0/bits/stl_algobase.h:243:56: error: macro "min" passed 3 arguments, but takes just 2 min(const _Tp& __a, const _Tp& __b, _Compare __comp) ^ /opt/gcc/include/c++/7.0.0/bits/stl_algobase.h:265:56: error: macro "max" passed 3 arguments, but takes just 2 max(const _Tp& __a, const _Tp& __b, _Compare __comp) ^ In file included from .../src/gdb/infrun.c:21:0: To the best of my grepping abilities, I believe I adjusted all min/max calls. gdb/ChangeLog: 2016-09-16 Pedro Alves <palves@redhat.com> * defs.h (min, max): Delete. * aarch64-tdep.c: Include <algorithm> and use std::min and std::max throughout. * aarch64-tdep.c: Likewise. * alpha-tdep.c: Likewise. * amd64-tdep.c: Likewise. * amd64-windows-tdep.c: Likewise. * arm-tdep.c: Likewise. * avr-tdep.c: Likewise. * breakpoint.c: Likewise. * btrace.c: Likewise. * ctf.c: Likewise. * disasm.c: Likewise. * doublest.c: Likewise. * dwarf2loc.c: Likewise. * dwarf2read.c: Likewise. * environ.c: Likewise. * exec.c: Likewise. * f-exp.y: Likewise. * findcmd.c: Likewise. * ft32-tdep.c: Likewise. * gcore.c: Likewise. * hppa-tdep.c: Likewise. * i386-darwin-tdep.c: Likewise. * i386-tdep.c: Likewise. * linux-thread-db.c: Likewise. * lm32-tdep.c: Likewise. * m32r-tdep.c: Likewise. * m88k-tdep.c: Likewise. * memrange.c: Likewise. * minidebug.c: Likewise. * mips-tdep.c: Likewise. * moxie-tdep.c: Likewise. * nds32-tdep.c: Likewise. * nios2-tdep.c: Likewise. * nto-procfs.c: Likewise. * parse.c: Likewise. * ppc-sysv-tdep.c: Likewise. * probe.c: Likewise. * record-btrace.c: Likewise. * remote.c: Likewise. * rs6000-tdep.c: Likewise. * rx-tdep.c: Likewise. * s390-linux-nat.c: Likewise. * s390-linux-tdep.c: Likewise. * ser-tcp.c: Likewise. * sh-tdep.c: Likewise. * sh64-tdep.c: Likewise. * source.c: Likewise. * sparc-tdep.c: Likewise. * symfile.c: Likewise. * target-memory.c: Likewise. * target.c: Likewise. * tic6x-tdep.c: Likewise. * tilegx-tdep.c: Likewise. * tracefile-tfile.c: Likewise. * tracepoint.c: Likewise. * valprint.c: Likewise. * value.c: Likewise. * xtensa-tdep.c: Likewise. * cli/cli-cmds.c: Likewise. * compile/compile-object-load.c: Likewise.
183 lines
4.4 KiB
C
183 lines
4.4 KiB
C
/* environ.c -- library for manipulating environments for GNU.
|
||
|
||
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 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 <http://www.gnu.org/licenses/>. */
|
||
|
||
#include "defs.h"
|
||
#include "environ.h"
|
||
#include <algorithm>
|
||
|
||
|
||
/* 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;
|
||
}
|
||
}
|
||
}
|