diff options
| -rw-r--r-- | gdb/ChangeLog | 6 | ||||
| -rwxr-xr-x | gdb/energize-patches | 12 | ||||
| -rw-r--r-- | gdb/main.c | 4 | ||||
| -rw-r--r-- | gdb/top.c | 12 | ||||
| -rw-r--r-- | gdb/top.h | 2 |
5 files changed, 21 insertions, 15 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 599a50d..10c72c5 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -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) * symtab.c (decode_line_1): fix a bug in dealing with '<>' diff --git a/gdb/energize-patches b/gdb/energize-patches index 1797701..ed5b581 100755 --- a/gdb/energize-patches +++ b/gdb/energize-patches @@ -932,22 +932,22 @@ *************** *** 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", - current_directory, dirbuf); + current_directory, gdb_dirbuf); else ! printf ("Working directory %s.\n", current_directory); } static void --- 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", - current_directory, dirbuf); + current_directory, gdb_dirbuf); else ! printf_filtered ("Working directory %s.\n", current_directory); } @@ -123,8 +123,8 @@ main (argc, argv) line[0] = '\0'; /* Terminate saved (now empty) cmd line */ instream = stdin; - getcwd (dirbuf, sizeof (dirbuf)); - current_directory = dirbuf; + getcwd (gdb_dirbuf, sizeof (gdb_dirbuf)); + current_directory = gdb_dirbuf; /* Parse arguments and options. */ { @@ -253,7 +253,7 @@ FILE *instream; char *current_directory; /* The directory name is actually stored here (usually). */ -char dirbuf[1024]; +char gdb_dirbuf[1024]; /* Function to call before reading a command, if nonzero. The function receives two args: an input stream, @@ -484,8 +484,8 @@ gdb_init () { /* Run the init function of each source file */ - getcwd (dirbuf, sizeof (dirbuf)); - current_directory = dirbuf; + getcwd (gdb_dirbuf, sizeof (gdb_dirbuf)); + current_directory = gdb_dirbuf; init_cmd_lists (); /* This needs to be done first */ initialize_all_files (); @@ -1878,11 +1878,11 @@ pwd_command (args, from_tty) int from_tty; { 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", - current_directory, dirbuf); + current_directory, gdb_dirbuf); else printf_unfiltered ("Working directory %s.\n", current_directory); } @@ -22,7 +22,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ extern char *line; extern int linesize; extern FILE *instream; -extern char dirbuf[1024]; +extern char gdb_dirbuf[1024]; extern int inhibit_gdbinit; extern int epoch_interface; extern char gdbinit[]; |