Consolidate definition of current_directory

I noticed that both gdbserver and gdb define current_directory.
However, as it is referenced by gdbsupport, it seemed better to define
it there as well.  This patch also moves the declaration to
pathstuff.h.  Tested by rebuilding.

diff --git a/gdb/top.c b/gdb/top.c
index a28e72f77f35057a5276d7918a46dc3c2cd55a54..f12a2111a9aafc9c83f39f57668078e21b00b371 100644 (file)
--- a/gdb/top.c
+++ b/gdb/top.c
@@ -141,10 +141,6 @@ show_confirm (struct ui_file *file, int from_tty,
              value);
 }
 
-/* Current working directory.  */
-
-char *current_directory;
-
 /* The last command line executed on the console.  Used for command
    repetitions when the user enters an empty line.  */
 

diff --git a/gdbserver/server.cc b/gdbserver/server.cc
index 8e53f226d3c06230070096a90683aaf0d29562b9..9f52d6e63fe3eee8a8cfa418d4a1bca02f30a99f 100644 (file)
--- a/gdbserver/server.cc
+++ b/gdbserver/server.cc
@@ -65,10 +65,6 @@
       break;                                   \
     }
 
-/* String containing the current directory (what getwd would return).  */
-
-char *current_directory;
-
 /* The environment to pass to the inferior when creating it.  */
 
 static gdb_environ our_environ;

diff --git a/gdbsupport/common-defs.h b/gdbsupport/common-defs.h
index e263d948ee1453220b8781143ead35dce94eba73..eed364a48ceff2865231d137b76982cab4145e96 100644 (file)
--- a/gdbsupport/common-defs.h
+++ b/gdbsupport/common-defs.h
@@ -213,9 +213,6 @@
 /* Pull in gdb::unique_xmalloc_ptr.  */
 #include "gdbsupport/gdb_unique_ptr.h"
 
-/* String containing the current directory (what getwd would return).  */
-extern char *current_directory;
-
 /* sbrk on macOS is not useful for our purposes, since sbrk(0) always
    returns the same value.  brk/sbrk on macOS is just an emulation
    that always returns a pointer to a 4MB section reserved for

diff --git a/gdbsupport/pathstuff.cc b/gdbsupport/pathstuff.cc
index cb2dd4f5782eb68f74e2ea7b8ab34e547556262d..a347123cf2b334e48ab02930d040a86687d6eef4 100644 (file)
--- a/gdbsupport/pathstuff.cc
+++ b/gdbsupport/pathstuff.cc
@@ -29,6 +29,10 @@
 
 /* See gdbsupport/pathstuff.h.  */
 
+char *current_directory;
+
+/* See gdbsupport/pathstuff.h.  */
+
 gdb::unique_xmalloc_ptr<char>
 gdb_realpath (const char *filename)
 {

diff --git a/gdbsupport/pathstuff.h b/gdbsupport/pathstuff.h
index 38828b7c4a30ffb503af0f8579e164eddc399f28..50e388aad047ab2157142ed113ec8798d5d6f054 100644 (file)
--- a/gdbsupport/pathstuff.h
+++ b/gdbsupport/pathstuff.h
@@ -136,4 +136,7 @@ extern const char *get_shell ();
 
 extern gdb::char_vector make_temp_filename (const std::string &f);
 
+/* String containing the current directory (what getwd would return).  */
+extern char *current_directory;
+
 #endif /* COMMON_PATHSTUFF_H */