Commit 3009276c by Pedro Alves Committed by DJ Delorie

filenames.h (IS_DIR_SEPARATOR_1): Rename from IS_DIR_SEPARATOR...

2010-04-23  Pedro Alves  <pedro@codesourcery.com>

include/
* filenames.h (IS_DIR_SEPARATOR_1): Rename from IS_DIR_SEPARATOR,
always define it independently of host, add `dos_based' parameter,
and handle it.
(HAS_DRIVE_SPEC_1): Rename from HAS_DRIVE_SPEC, always define it
independently of host, add `dos_based' parameter, and handle it.
(IS_ABSOLUTE_PATH_1): Rename from IS_ABSOLUTE_PATH, always define
it independently of host, add `dos_based' parameter, and handle
it.
(IS_DOS_DIR_SEPARATOR, IS_DOS_ABSOLUTE_PATH)
(IS_UNIX_DIR_SEPARATOR, IS_UNIX_ABSOLUTE_PATH)
(HAS_DOS_DRIVE_SPEC): New.
(HAS_DRIVE_SPEC): Reimplement on top of HAS_DRIVE_SPEC_1.
(IS_DIR_SEPARATOR): Reimplement on top of IS_DIR_SEPARATOR_1.
(IS_ABSOLUTE_PATH): Reimplement on top of IS_ABSOLUTE_PATH_1.
* libiberty.h (dos_lbasename, unix_lbasename): Declare.

libiberty/
* lbasename.c (lbasename): Split into ...
(unix_lbasename, dos_basename): ... these.
(lbasename): ... and reimplement on top of them.
* Makefile.in (lbasename.o): Add dependency on
$(INCDIR)/filenames.h.

From-SVN: r158681
parent 5b29e4f6
2010-04-23 Pedro Alves <pedro@codesourcery.com>
* filenames.h (IS_DIR_SEPARATOR_1): Rename from IS_DIR_SEPARATOR,
always define it independently of host, add `dos_based' parameter,
and handle it.
(HAS_DRIVE_SPEC_1): Rename from HAS_DRIVE_SPEC, always define it
independently of host, add `dos_based' parameter, and handle it.
(IS_ABSOLUTE_PATH_1): Rename from IS_ABSOLUTE_PATH, always define
it independently of host, add `dos_based' parameter, and handle
it.
(IS_DOS_DIR_SEPARATOR, IS_DOS_ABSOLUTE_PATH)
(IS_UNIX_DIR_SEPARATOR, IS_UNIX_ABSOLUTE_PATH)
(HAS_DOS_DRIVE_SPEC): New.
(HAS_DRIVE_SPEC): Reimplement on top of HAS_DRIVE_SPEC_1.
(IS_DIR_SEPARATOR): Reimplement on top of IS_DIR_SEPARATOR_1.
(IS_ABSOLUTE_PATH): Reimplement on top of IS_ABSOLUTE_PATH_1.
* libiberty.h (dos_lbasename, unix_lbasename): Declare.
2010-04-20 Nick Clifton <nickc@redhat.com> 2010-04-20 Nick Clifton <nickc@redhat.com>
* sha1.h: Update copyright notice to use GPLv3. * sha1.h: Update copyright notice to use GPLv3.
......
...@@ -31,34 +31,46 @@ extern "C" { ...@@ -31,34 +31,46 @@ extern "C" {
#endif #endif
#if defined(__MSDOS__) || defined(_WIN32) || defined(__OS2__) || defined (__CYGWIN__) #if defined(__MSDOS__) || defined(_WIN32) || defined(__OS2__) || defined (__CYGWIN__)
# ifndef HAVE_DOS_BASED_FILE_SYSTEM
#ifndef HAVE_DOS_BASED_FILE_SYSTEM # define HAVE_DOS_BASED_FILE_SYSTEM 1
#define HAVE_DOS_BASED_FILE_SYSTEM 1 # endif
# define PATH_SEPARATOR ';'
# define HAS_DRIVE_SPEC(f) HAS_DOS_DRIVE_SPEC (f)
# define IS_DIR_SEPARATOR(c) IS_DOS_DIR_SEPARATOR (c)
# define IS_ABSOLUTE_PATH(f) IS_DOS_ABSOLUTE_PATH (f)
#else /* not DOSish */
# define PATH_SEPARATOR ':'
# define HAS_DRIVE_SPEC(f) (0)
# define IS_DIR_SEPARATOR(c) IS_UNIX_DIR_SEPARATOR (c)
# define IS_ABSOLUTE_PATH(f) IS_UNIX_ABSOLUTE_PATH (f)
#endif #endif
#define IS_DIR_SEPARATOR(c) ((c) == '/' || (c) == '\\') #define IS_DIR_SEPARATOR_1(dos_based, c) \
(((c) == '/') \
|| (((c) == '\\') && (dos_based)))
#define HAS_DRIVE_SPEC(f) (((f)[0]) && ((f)[1] == ':')) #define HAS_DRIVE_SPEC_1(dos_based, f) \
((f)[0] && ((f)[1] == ':') && (dos_based))
/* Remove the drive spec from F, assuming HAS_DRIVE_SPEC (f). /* Remove the drive spec from F, assuming HAS_DRIVE_SPEC (f).
The result is a pointer to the remainder of F. */ The result is a pointer to the remainder of F. */
#define STRIP_DRIVE_SPEC(f) ((f) + 2) #define STRIP_DRIVE_SPEC(f) ((f) + 2)
/* Note that IS_ABSOLUTE_PATH accepts d:foo as well, although it is #define IS_DOS_DIR_SEPARATOR(c) IS_DIR_SEPARATOR_1 (1, c)
only semi-absolute. This is because the users of IS_ABSOLUTE_PATH #define IS_DOS_ABSOLUTE_PATH(f) IS_ABSOLUTE_PATH_1 (1, f)
want to know whether to prepend the current working directory to #define HAS_DOS_DRIVE_SPEC(f) HAS_DRIVE_SPEC_1 (1, f)
a file name, which should not be done with a name like d:foo. */
#define IS_ABSOLUTE_PATH(f) (IS_DIR_SEPARATOR((f)[0]) || HAS_DRIVE_SPEC(f)) #define IS_UNIX_DIR_SEPARATOR(c) IS_DIR_SEPARATOR_1 (0, c)
#define IS_UNIX_ABSOLUTE_PATH(f) IS_ABSOLUTE_PATH_1 (0, f)
#else /* not DOSish */
/* Note that when DOS_BASED is true, IS_ABSOLUTE_PATH accepts d:foo as
#define IS_DIR_SEPARATOR(c) ((c) == '/') well, although it is only semi-absolute. This is because the users
#define IS_ABSOLUTE_PATH(f) (IS_DIR_SEPARATOR((f)[0])) of IS_ABSOLUTE_PATH want to know whether to prepend the current
working directory to a file name, which should not be done with a
#define HAS_DRIVE_SPEC(f) (0) name like d:foo. */
#define STRIP_DRIVE_SPEC(f) (f) #define IS_ABSOLUTE_PATH_1(dos_based, f) \
(IS_DIR_SEPARATOR_1 (dos_based, (f)[0]) \
#endif /* not DOSish */ || HAS_DRIVE_SPEC_1 (dos_based, f))
extern int filename_cmp (const char *s1, const char *s2); extern int filename_cmp (const char *s1, const char *s2);
#define FILENAME_CMP(s1, s2) filename_cmp(s1, s2) #define FILENAME_CMP(s1, s2) filename_cmp(s1, s2)
......
...@@ -116,6 +116,17 @@ extern char *basename (const char *); ...@@ -116,6 +116,17 @@ extern char *basename (const char *);
extern const char *lbasename (const char *); extern const char *lbasename (const char *);
/* Same, but assumes DOS semantics (drive name, backslash is also a
dir separator) regardless of host. */
extern const char *dos_lbasename (const char *);
/* Same, but assumes Unix semantics (absolute paths always start with
a slash, only forward slash is accepted as dir separator)
regardless of host. */
extern const char *unix_lbasename (const char *);
/* A well-defined realpath () that is always compiled in. */ /* A well-defined realpath () that is always compiled in. */
extern char *lrealpath (const char *); extern char *lrealpath (const char *);
......
2010-04-23 Pedro Alves <pedro@codesourcery.com>
* lbasename.c (lbasename): Split into ...
(unix_lbasename, dos_basename): ... these.
(lbasename): ... and reimplement on top of them.
* Makefile.in (lbasename.o): Add dependency on
$(INCDIR)/filenames.h.
2010-04-07 Jakub Jelinek <jakub@redhat.com> 2010-04-07 Jakub Jelinek <jakub@redhat.com>
* regex.c (byte_re_match_2_internal): Avoid set but not used * regex.c (byte_re_match_2_internal): Avoid set but not used
......
...@@ -724,7 +724,7 @@ $(CONFIGURED_OFILES): stamp-picdir ...@@ -724,7 +724,7 @@ $(CONFIGURED_OFILES): stamp-picdir
./lbasename.o: $(srcdir)/lbasename.c config.h $(INCDIR)/ansidecl.h \ ./lbasename.o: $(srcdir)/lbasename.c config.h $(INCDIR)/ansidecl.h \
$(INCDIR)/filenames.h $(INCDIR)/libiberty.h \ $(INCDIR)/filenames.h $(INCDIR)/libiberty.h \
$(INCDIR)/safe-ctype.h $(INCDIR)/safe-ctype.h $(INCDIR)/filenames.h
if [ x"$(PICFLAG)" != x ]; then \ if [ x"$(PICFLAG)" != x ]; then \
$(COMPILE.c) $(PICFLAG) $(srcdir)/lbasename.c -o pic/$@; \ $(COMPILE.c) $(PICFLAG) $(srcdir)/lbasename.c -o pic/$@; \
else true; fi else true; fi
......
...@@ -46,19 +46,39 @@ and a path ending in @code{/} returns the empty string after it. ...@@ -46,19 +46,39 @@ and a path ending in @code{/} returns the empty string after it.
#include "filenames.h" #include "filenames.h"
const char * const char *
lbasename (const char *name) unix_lbasename (const char *name)
{
const char *base;
for (base = name; *name; name++)
if (IS_UNIX_DIR_SEPARATOR (*name))
base = name + 1;
return base;
}
const char *
dos_lbasename (const char *name)
{ {
const char *base; const char *base;
#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
/* Skip over a possible disk name. */ /* Skip over a possible disk name. */
if (ISALPHA (name[0]) && name[1] == ':') if (ISALPHA (name[0]) && name[1] == ':')
name += 2; name += 2;
#endif
for (base = name; *name; name++) for (base = name; *name; name++)
if (IS_DIR_SEPARATOR (*name)) if (IS_DOS_DIR_SEPARATOR (*name))
base = name + 1; base = name + 1;
return base; return base;
} }
const char *
lbasename (const char *name)
{
#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
return dos_lbasename (name);
#else
return unix_lbasename (name);
#endif
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment