darkkirb/old-cross-binutils
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

* environ.h (struct environ): Rename to ...

Browse source 
(struct gdb_environ): ... this.
	(make_environ): Update prototype.
	(free_environ): Likewise.
	(init_environ): Likewise.
	(get_in_environ): Likewise.
	(set_in_environ): Likewise.
	(unset_in_environ): Likewise.
	(environ_vector): Likewise.
	* environ.c (make_environ): Replace "struct environ" with "struct
	gdb_environ".
	(free_environ): Likewise.
	(init_environ): Likewise.
	(environ_vector): Likewise.
	(get_in_environ): Likewise.
	(set_in_environ): Likewise.
	(unset_in_environ): Likewise.
	* infcmd.c (inferior_environ): Likewise.
	* inferior.h (inferior_environ): Likewise.
This commit is contained in:
Mark Mitchell 2005-03-08 22:17:34 +00:00
parent f67a969fd6
commit 1bf1958d53
5 changed files with 45 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
gdb/ChangeLog
View file

@ -1,3 +1,25 @@
2005-03-08 Mark Mitchell <mark@codesourcery.com>
* environ.h (struct environ): Rename to ...
(struct gdb_environ): ... this.
(make_environ): Update prototype.
(free_environ): Likewise.
(init_environ): Likewise.
(get_in_environ): Likewise.
(set_in_environ): Likewise.
(unset_in_environ): Likewise.
(environ_vector): Likewise.
* environ.c (make_environ): Replace "struct environ" with "struct
gdb_environ".
(free_environ): Likewise.
(init_environ): Likewise.
(environ_vector): Likewise.
(get_in_environ): Likewise.
(set_in_environ): Likewise.
(unset_in_environ): Likewise.
* infcmd.c (inferior_environ): Likewise.
* inferior.h (inferior_environ): Likewise.
2005-03-08 Joel Brobecker <brobecker@adacore.com>
* infcmd.c (run_command_1): New function, extracted from

20
gdb/environ.c
View file

@ -1,6 +1,6 @@
/* environ.c -- library for manipulating environments for GNU.
Copyright 1986, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 2000,
Copyright 1986, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 2000, 2005
2003 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify
@ -28,12 +28,12 @@
/* Return a new environment object. */
struct environ *
struct gdb_environ *
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 *));
@ -44,7 +44,7 @@ make_environ (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;
@ -59,7 +59,7 @@ free_environ (struct environ *e)
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;
@ -91,7 +91,7 @@ init_environ (struct environ *e)
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;
}
@ -99,7 +99,7 @@ environ_vector (struct environ *e)
/* 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;
@ -115,7 +115,7 @@ get_in_environ (const struct environ *e, const char *var)
/* 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);
@ -162,7 +162,7 @@ set_in_environ (struct environ *e, const char *var, const char *value)
/* 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;

18
gdb/environ.h
View file

@ -1,5 +1,5 @@
/* Header for environment manipulation library.
Copyright 1989, 1992, 2000 Free Software Foundation, Inc.
Copyright 1989, 1992, 2000, 2005 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
@ -21,7 +21,7 @@
/* We manipulate environments represented as these structures. */
struct environ
struct gdb_environ
{
/* Number of usable slots allocated in VECTOR.
VECTOR always has one slot not counted here,
@ -34,18 +34,18 @@ struct environ
char **vector;
};
extern struct environ *make_environ (void);
extern struct gdb_environ *make_environ (void);
extern void free_environ (struct environ *);
extern void free_environ (struct gdb_environ *);
extern void init_environ (struct environ *);
extern void init_environ (struct gdb_environ *);
extern char *get_in_environ (const struct environ *, const char *);
extern char *get_in_environ (const struct gdb_environ *, const char *);
extern void set_in_environ (struct environ *, const char *, const char *);
extern void set_in_environ (struct gdb_environ *, const char *, const char *);
extern void unset_in_environ (struct environ *, char *);
extern void unset_in_environ (struct gdb_environ *, char *);
extern char **environ_vector (struct environ *);
extern char **environ_vector (struct gdb_environ *);
#endif /* defined (ENVIRON_H) */

2
gdb/infcmd.c
View file

@ -198,7 +198,7 @@ int step_multi;
/* Environment to use for running inferior,
in format described in environ.h. */
struct environ *inferior_environ;
struct gdb_environ *inferior_environ;
/* Accessor routines. */

5
gdb/inferior.h
View file

@ -2,7 +2,8 @@
Where it is, why it stopped, and how to step it.
Copyright 1986, 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995,
1996, 1998, 1999, 2000, 2001, 2003 Free Software Foundation, Inc.
1996, 1998, 1999, 2000, 2001, 2003, 2004, 2005
Free Software Foundation, Inc.
This file is part of GDB.
@ -145,7 +146,7 @@ extern int inferior_ignoring_leading_exec_events;
/* Inferior environment. */
extern struct environ *inferior_environ;
extern struct gdb_environ *inferior_environ;
extern void clear_proceed_status (void);