* source.c (mod_path, openp): Use HAVE_DOS_BASED_FILE_SYSTEM

instead of system-specific define's like _WIN32 and __MSDOS__.
	Use IS_DIR_SEPARATOR and IS_ABSOLUTE_PATH instead of SLASH_P and
	ROOTED_P.
	(top-level): #include "filenames.h".

	* solib.c (solib_open): Use IS_DIR_SEPARATOR and IS_ABSOLUTE_PATH
	instead of SLASH_CHAR, ROOTED_P and SLASH_P.
	(top-level): #include "filenames.h".

	* defs.h (SLASH_P, SLASH_CHAR, ROOTED_P): Remove definitions.
	(SLASH_STRING): Define only for _WIN32.

	* completer.c: Use HAVE_DOS_BASED_FILE_SYSTEM instead of
	__MSDOS_.

	* cli/cli-cmds.c (cd_command): Use IS_DIR_SEPARATOR and
	IS_ABSOLUTE_PATH instead of SLASH_P and ROOTED_P.  Replace
	system-specific ifdefs with HAVE_DOS_BASED_FILE_SYSTEM.
	(top-level): #include "filenames.h".
This commit is contained in:
Eli Zaretskii 2001-06-04 07:45:08 +00:00
parent 37ba1196cf
commit fe4e3eb861
6 changed files with 58 additions and 49 deletions

View file

@ -39,6 +39,7 @@
#include "language.h"
#include "gdbcmd.h"
#include "completer.h"
#include "filenames.h" /* for DOSish file names */
#include "solist.h"
@ -101,10 +102,14 @@ solib_open (char *in_pathname, char **found_pathname)
{
int found_file = -1;
char *temp_pathname = NULL;
char *p = in_pathname;
if (strchr (in_pathname, SLASH_CHAR))
while (*p && !IS_DIR_SEPARATOR (*p))
p++;
if (*p)
{
if (! ROOTED_P (in_pathname) || solib_absolute_prefix == NULL)
if (! IS_ABSOLUTE_PATH (in_pathname) || solib_absolute_prefix == NULL)
temp_pathname = in_pathname;
else
{
@ -112,7 +117,7 @@ solib_open (char *in_pathname, char **found_pathname)
/* Remove trailing slashes from absolute prefix. */
while (prefix_len > 0
&& SLASH_P (solib_absolute_prefix[prefix_len - 1]))
&& IS_DIR_SEPARATOR (solib_absolute_prefix[prefix_len - 1]))
prefix_len--;
/* Cat the prefixed pathname together. */