* 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.
This commit is contained in:
parent
3ffd33cf59
commit
c369014146
4 changed files with 12 additions and 5 deletions
|
@ -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>
|
2001-06-04 Eli Zaretskii <eliz@is.elta.co.il>
|
||||||
|
|
||||||
* mips-tdep.c (show_mipsfpu_command): Remove unused variable msg.
|
* mips-tdep.c (show_mipsfpu_command): Remove unused variable msg.
|
||||||
|
|
|
@ -293,7 +293,7 @@ cd_command (char *dir, int from_tty)
|
||||||
if (chdir (dir) < 0)
|
if (chdir (dir) < 0)
|
||||||
perror_with_name (dir);
|
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:.",
|
/* There's too much mess with DOSish names like "d:", "d:.",
|
||||||
"d:./foo" etc. Instead of having lots of special #ifdef'ed code,
|
"d:./foo" etc. Instead of having lots of special #ifdef'ed code,
|
||||||
simply get the canonicalized name of the current directory. */
|
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
|
/* Remove the trailing slash unless this is a root directory
|
||||||
(including a drive letter on non-Unix systems). */
|
(including a drive letter on non-Unix systems). */
|
||||||
if (!(len == 1) /* "/" */
|
if (!(len == 1) /* "/" */
|
||||||
#if HAVE_DOS_BASED_FILE_SYSTEM
|
#ifdef HAVE_DOS_BASED_FILE_SYSTEM
|
||||||
&& !(len == 3 && dir[1] == ':') /* "d:/" */
|
&& !(len == 3 && dir[1] == ':') /* "d:/" */
|
||||||
#endif
|
#endif
|
||||||
)
|
)
|
||||||
|
|
|
@ -64,7 +64,7 @@ static char *gdb_completer_command_word_break_characters =
|
||||||
break characters any characters that are commonly used in file
|
break characters any characters that are commonly used in file
|
||||||
names, such as '-', '+', '~', etc. Otherwise, readline displays
|
names, such as '-', '+', '~', etc. Otherwise, readline displays
|
||||||
incorrect completion candidates. */
|
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
|
/* MS-DOS and MS-Windows use colon as part of the drive spec, and most
|
||||||
programs support @foo style response files. */
|
programs support @foo style response files. */
|
||||||
static char *gdb_completer_file_name_break_characters = " \t\n*|\"';?><@";
|
static char *gdb_completer_file_name_break_characters = " \t\n*|\"';?><@";
|
||||||
|
|
|
@ -332,7 +332,7 @@ mod_path (char *dirname, char **which_path)
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!(IS_DIR_SEPARATOR (*name) && p <= name + 1) /* "/" */
|
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: */
|
/* On MS-DOS and MS-Windows, h:\ is different from h: */
|
||||||
&& !(p == name + 3 && name[1] == ':') /* "d:/" */
|
&& !(p == name + 3 && name[1] == ':') /* "d:/" */
|
||||||
#endif
|
#endif
|
||||||
|
@ -371,7 +371,7 @@ mod_path (char *dirname, char **which_path)
|
||||||
|
|
||||||
if (name[0] == '~')
|
if (name[0] == '~')
|
||||||
name = tilde_expand (name);
|
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:." */
|
else if (IS_ABSOLUTE_PATH (name) && p == name + 2) /* "d:" => "d:." */
|
||||||
name = concat (name, ".", NULL);
|
name = concat (name, ".", NULL);
|
||||||
#endif
|
#endif
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue