* 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.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 599a50d7cef7eb1372be6e43bf646cd3fad579c9..10c72c5313dd974b30443e2b75d1fe3699378b9d 100644 (file)
--- 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 17977012683ddee818dd3f2091ba1f3cc17fb762..ed5b581f696281fea12a739bd8b069f3f1a86524 100755 (executable)
--- a/gdb/energize-patches
+++ b/gdb/energize-patches
@@ -932,22 +932,22 @@
   \f
 ***************
 *** 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);
   }

diff --git a/gdb/main.c b/gdb/main.c
index eb0b8e20d84ec8bff99917341907ddda9be92f3a..2e0c00de86965912f78b4ba97a06094101b37a85 100644 (file)
--- a/gdb/main.c
+++ b/gdb/main.c
@@ -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.  */
   {

diff --git a/gdb/top.c b/gdb/top.c
index 1fe7549ef50141915f13b4f9237abf806408012e..692df82ea13b0d1aa33b1e9efb855805efe7099d 100644 (file)
--- a/gdb/top.c
+++ b/gdb/top.c
@@ -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);
 }

diff --git a/gdb/top.h b/gdb/top.h
index 5a508206ceec513fbda753ecf227c5ac549829b9..6ae28a25da43fb3c8d658caef6a22fa5d640cb50 100644 (file)
--- a/gdb/top.h
+++ b/gdb/top.h
@@ -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[];