diff options
Diffstat (limited to 'gdb/main.c')
| -rw-r--r-- | gdb/main.c | 21 |
1 files changed, 16 insertions, 5 deletions
@@ -44,6 +44,11 @@ #include "auto-load.h" #include "maint.h" +#include "filenames.h" +#ifdef __MINGW32__ +# include "windows-nat.h" +#endif + /* The selected interpreter. This will be used as a set command variable, so it should always be malloc'ed - since do_setshow_command will free it. */ @@ -181,15 +186,15 @@ get_init_files (char **system_gdbinit, has been provided, search for SYSTEM_GDBINIT there. */ if (gdb_datadir_provided && datadir_len < sys_gdbinit_len - && strncmp (SYSTEM_GDBINIT, GDB_DATADIR, datadir_len) == 0 - && strchr (SLASH_STRING, SYSTEM_GDBINIT[datadir_len]) != NULL) + && filename_ncmp (SYSTEM_GDBINIT, GDB_DATADIR, datadir_len) == 0 + && IS_DIR_SEPARATOR (SYSTEM_GDBINIT[datadir_len])) { /* Append the part of SYSTEM_GDBINIT that follows GDB_DATADIR to gdb_datadir. */ char *tmp_sys_gdbinit = xstrdup (SYSTEM_GDBINIT + datadir_len); char *p; - for (p = tmp_sys_gdbinit; strchr (SLASH_STRING, *p); ++p) + for (p = tmp_sys_gdbinit; IS_DIR_SEPARATOR (*p); ++p) continue; relocated_sysgdbinit = concat (gdb_datadir, SLASH_STRING, p, NULL); @@ -378,7 +383,13 @@ captured_main (void *data) gdb_stdtargerr = gdb_stderr; /* for moment */ gdb_stdtargin = gdb_stdin; /* for moment */ +#ifdef __MINGW32__ + /* On Windows, argv[0] is not necessarily set to absolute form when + GDB is found along PATH, without which relocation doesn't work. */ + gdb_program_name = windows_get_absolute_argv0 (argv[0]); +#else gdb_program_name = xstrdup (argv[0]); +#endif if (! getcwd (gdb_dirbuf, sizeof (gdb_dirbuf))) /* Don't use *_filtered or warning() (which relies on @@ -412,7 +423,7 @@ captured_main (void *data) #ifdef RELOC_SRCDIR add_substitute_path_rule (RELOC_SRCDIR, - make_relative_prefix (argv[0], BINDIR, + make_relative_prefix (gdb_program_name, BINDIR, RELOC_SRCDIR)); #endif @@ -730,7 +741,7 @@ captured_main (void *data) /* Initialize all files. Give the interpreter a chance to take control of the console via the deprecated_init_ui_hook (). */ - gdb_init (argv[0]); + gdb_init (gdb_program_name); /* Now that gdb_init has created the initial inferior, we're in position to set args for that inferior. */ |