From c50e54825bfea1ab6afbd984a4d2e78e9306e70f Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Mon, 28 Mar 2022 09:46:55 -0600 Subject: 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. --- gdbsupport/common-defs.h | 3 --- gdbsupport/pathstuff.cc | 4 ++++ gdbsupport/pathstuff.h | 3 +++ 3 files changed, 7 insertions(+), 3 deletions(-) (limited to 'gdbsupport') diff --git a/gdbsupport/common-defs.h b/gdbsupport/common-defs.h index e263d94..eed364a 100644 --- 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 cb2dd4f..a347123 100644 --- 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 gdb_realpath (const char *filename) { diff --git a/gdbsupport/pathstuff.h b/gdbsupport/pathstuff.h index 38828b7..50e388a 100644 --- 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 */ -- cgit v1.1