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

* energize-patches, main.c (main), top.c (gdb_init, pwd_command),

Browse source 
top.h: Change all occurances of dirbuf to gdb_dirbuf.  Collides
	with global variable of same name in libnsl.so on UnixWare.
This commit is contained in:
Fred Fish 1994-06-23 00:08:09 +00:00
parent 3bf36e67e2
commit b7ec5b8da5
5 changed files with 21 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
gdb/ChangeLog
View file

@ -1,3 +1,9 @@
Wed Jun 22 16:54:15 1994 Fred Fish (fnf@cygnus.com)
* energize-patches, main.c (main), top.c (gdb_init, pwd_command),
top.h: Change all occurances of dirbuf to gdb_dirbuf. Collides
with global variable of same name in libnsl.so on UnixWare.
Wed Jun 22 14:40:52 1994 Kung Hsu (kung@mexican.cygnus.com) Wed Jun 22 14:40:52 1994 Kung Hsu (kung@mexican.cygnus.com)
* symtab.c (decode_line_1): fix a bug in dealing with '<>' * symtab.c (decode_line_1): fix a bug in dealing with '<>'

12
gdb/energize-patches
View file

@ -932,22 +932,22 @@
*************** ***************
*** 1920,1929 **** *** 1920,1929 ****
getcwd (dirbuf, sizeof (dirbuf)); getcwd (gdb_dirbuf, sizeof (gdb_dirbuf));
if (strcmp (dirbuf, current_directory)) if (strcmp (gdb_dirbuf, current_directory))
! printf ("Working directory %s\n (canonically %s).\n", ! printf ("Working directory %s\n (canonically %s).\n",
current_directory, dirbuf); current_directory, gdb_dirbuf);
else else
! printf ("Working directory %s.\n", current_directory); ! printf ("Working directory %s.\n", current_directory);
} }
static void static void
--- 1931,1940 ---- --- 1931,1940 ----
getcwd (dirbuf, sizeof (dirbuf)); getcwd (gdb_dirbuf, sizeof (gdb_dirbuf));
if (strcmp (dirbuf, current_directory)) if (strcmp (gdb_dirbuf, current_directory))
! printf_filtered ("Working directory %s\n (canonically %s).\n", ! printf_filtered ("Working directory %s\n (canonically %s).\n",
current_directory, dirbuf); current_directory, gdb_dirbuf);
else else
! printf_filtered ("Working directory %s.\n", current_directory); ! printf_filtered ("Working directory %s.\n", current_directory);
} }

4
gdb/main.c
View file

@ -123,8 +123,8 @@ main (argc, argv)
line[0] = '\0'; /* Terminate saved (now empty) cmd line */ line[0] = '\0'; /* Terminate saved (now empty) cmd line */
instream = stdin; instream = stdin;
getcwd (dirbuf, sizeof (dirbuf)); getcwd (gdb_dirbuf, sizeof (gdb_dirbuf));
current_directory = dirbuf; current_directory = gdb_dirbuf;
/* Parse arguments and options. */ /* Parse arguments and options. */
{ {

12
gdb/top.c
View file

@ -253,7 +253,7 @@ FILE *instream;
char *current_directory; char *current_directory;
/* The directory name is actually stored here (usually). */ /* The directory name is actually stored here (usually). */
char dirbuf[1024]; char gdb_dirbuf[1024];
/* Function to call before reading a command, if nonzero. /* Function to call before reading a command, if nonzero.
The function receives two args: an input stream, The function receives two args: an input stream,
@ -484,8 +484,8 @@ gdb_init ()
{ {
/* Run the init function of each source file */ /* Run the init function of each source file */
getcwd (dirbuf, sizeof (dirbuf)); getcwd (gdb_dirbuf, sizeof (gdb_dirbuf));
current_directory = dirbuf; current_directory = gdb_dirbuf;
init_cmd_lists (); /* This needs to be done first */ init_cmd_lists (); /* This needs to be done first */
initialize_all_files (); initialize_all_files ();
@ -1878,11 +1878,11 @@ pwd_command (args, from_tty)
int from_tty; int from_tty;
{ {
if (args) error ("The \"pwd\" command does not take an argument: %s", args); if (args) error ("The \"pwd\" command does not take an argument: %s", args);
getcwd (dirbuf, sizeof (dirbuf)); getcwd (gdb_dirbuf, sizeof (gdb_dirbuf));
if (!STREQ (dirbuf, current_directory)) if (!STREQ (gdb_dirbuf, current_directory))
printf_unfiltered ("Working directory %s\n (canonically %s).\n", printf_unfiltered ("Working directory %s\n (canonically %s).\n",
current_directory, dirbuf); current_directory, gdb_dirbuf);
else else
printf_unfiltered ("Working directory %s.\n", current_directory); printf_unfiltered ("Working directory %s.\n", current_directory);
} }

2
gdb/top.h
View file

@ -22,7 +22,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
extern char *line; extern char *line;
extern int linesize; extern int linesize;
extern FILE *instream; extern FILE *instream;
extern char dirbuf[1024]; extern char gdb_dirbuf[1024];
extern int inhibit_gdbinit; extern int inhibit_gdbinit;
extern int epoch_interface; extern int epoch_interface;
extern char gdbinit[]; extern char gdbinit[];