diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2001-06-06 10:27:59 +0000 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2001-06-06 10:27:59 +0000 |
| commit | c369014146eb1fb32c3dd5566a71bdd084220d2a (patch) | |
| tree | 02d97750a74bf2321aaaa2c6184eb021a07f8736 | |
| parent | 3ffd33cf59cb308d57b1778cd6ec8ed27cdf2f51 (diff) | |
| download | gdb-c369014146eb1fb32c3dd5566a71bdd084220d2a.zip gdb-c369014146eb1fb32c3dd5566a71bdd084220d2a.tar.gz gdb-c369014146eb1fb32c3dd5566a71bdd084220d2a.tar.bz2 | |
* source.c (mod_path, openp): Use #ifdef HAVE_DOS_BASED_FILE_SYSTEM
instead of #if HAVE_DOS_BASED_FILE_SYSTEM.
* completer.c: Ditto.
* cli/cli-cmds.c (cd_command): Ditto.
| -rw-r--r-- | gdb/ChangeLog | 7 | ||||
| -rw-r--r-- | gdb/cli/cli-cmds.c | 4 | ||||
| -rw-r--r-- | gdb/completer.c | 2 | ||||
| -rw-r--r-- | gdb/source.c | 4 |
4 files changed, 12 insertions, 5 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 0a034b9..ae38ae9 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,10 @@ +2001-06-06 Eli Zaretskii <eliz@is.elta.co.il> + + * source.c (mod_path, openp): Use #ifdef HAVE_DOS_BASED_FILE_SYSTEM + instead of #if HAVE_DOS_BASED_FILE_SYSTEM. + * completer.c: Ditto. + * cli/cli-cmds.c (cd_command): Ditto. + 2001-06-04 Eli Zaretskii <eliz@is.elta.co.il> * mips-tdep.c (show_mipsfpu_command): Remove unused variable msg. diff --git a/gdb/cli/cli-cmds.c b/gdb/cli/cli-cmds.c index ca700ed..660bbaf 100644 --- a/gdb/cli/cli-cmds.c +++ b/gdb/cli/cli-cmds.c @@ -293,7 +293,7 @@ cd_command (char *dir, int from_tty) if (chdir (dir) < 0) perror_with_name (dir); -#if HAVE_DOS_BASED_FILE_SYSTEM +#ifdef HAVE_DOS_BASED_FILE_SYSTEM /* There's too much mess with DOSish names like "d:", "d:.", "d:./foo" etc. Instead of having lots of special #ifdef'ed code, simply get the canonicalized name of the current directory. */ @@ -306,7 +306,7 @@ cd_command (char *dir, int from_tty) /* Remove the trailing slash unless this is a root directory (including a drive letter on non-Unix systems). */ if (!(len == 1) /* "/" */ -#if HAVE_DOS_BASED_FILE_SYSTEM +#ifdef HAVE_DOS_BASED_FILE_SYSTEM && !(len == 3 && dir[1] == ':') /* "d:/" */ #endif ) diff --git a/gdb/completer.c b/gdb/completer.c index 90f428c..db16d1f 100644 --- a/gdb/completer.c +++ b/gdb/completer.c @@ -64,7 +64,7 @@ static char *gdb_completer_command_word_break_characters = break characters any characters that are commonly used in file names, such as '-', '+', '~', etc. Otherwise, readline displays incorrect completion candidates. */ -#if HAVE_DOS_BASED_FILE_SYSTEM +#ifdef HAVE_DOS_BASED_FILE_SYSTEM /* MS-DOS and MS-Windows use colon as part of the drive spec, and most programs support @foo style response files. */ static char *gdb_completer_file_name_break_characters = " \t\n*|\"';?><@"; diff --git a/gdb/source.c b/gdb/source.c index fdb6859..ebc82dc 100644 --- a/gdb/source.c +++ b/gdb/source.c @@ -332,7 +332,7 @@ mod_path (char *dirname, char **which_path) } if (!(IS_DIR_SEPARATOR (*name) && p <= name + 1) /* "/" */ -#if HAVE_DOS_BASED_FILE_SYSTEM +#ifdef HAVE_DOS_BASED_FILE_SYSTEM /* On MS-DOS and MS-Windows, h:\ is different from h: */ && !(p == name + 3 && name[1] == ':') /* "d:/" */ #endif @@ -371,7 +371,7 @@ mod_path (char *dirname, char **which_path) if (name[0] == '~') name = tilde_expand (name); -#if HAVE_DOS_BASED_FILE_SYSTEM +#ifdef HAVE_DOS_BASED_FILE_SYSTEM else if (IS_ABSOLUTE_PATH (name) && p == name + 2) /* "d:" => "d:." */ name = concat (name, ".", NULL); #endif |