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.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@158681 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/include/ChangeLog b/include/ChangeLog
index 6400a8e..1d4b049 100644 (file)
--- a/include/ChangeLog
+++ b/include/ChangeLog
@@ -1,3 +1,21 @@
+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>
 
        * sha1.h: Update copyright notice to use GPLv3.

diff --git a/include/filenames.h b/include/filenames.h
index 7f352e0..ff4e5ac 100644 (file)
--- a/include/filenames.h
+++ b/include/filenames.h
@@ -34,29 +34,28 @@ extern "C" {
 #  ifndef HAVE_DOS_BASED_FILE_SYSTEM
 #    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
 
-#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).
    The result is a pointer to the remainder of F.  */
 #define STRIP_DRIVE_SPEC(f)    ((f) + 2)
 
-/* Note that IS_ABSOLUTE_PATH accepts d:foo as well, although it is
-   only semi-absolute.  This is because the users 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 name like d:foo.  */
-#define IS_ABSOLUTE_PATH(f)    (IS_DIR_SEPARATOR((f)[0]) || HAS_DRIVE_SPEC(f))
-
 #define IS_DOS_DIR_SEPARATOR(c) IS_DIR_SEPARATOR_1 (1, c)
 #define IS_DOS_ABSOLUTE_PATH(f) IS_ABSOLUTE_PATH_1 (1, f)
 #define HAS_DOS_DRIVE_SPEC(f) HAS_DRIVE_SPEC_1 (1, f)
@@ -64,10 +63,14 @@ extern "C" {
 #define IS_UNIX_DIR_SEPARATOR(c) IS_DIR_SEPARATOR_1 (0, c)
 #define IS_UNIX_ABSOLUTE_PATH(f) IS_ABSOLUTE_PATH_1 (0, f)
 
-#define HAS_DRIVE_SPEC(f)      (0)
-#define STRIP_DRIVE_SPEC(f)    (f)
-
-#endif /* not DOSish */
+/* Note that when DOS_BASED is true, IS_ABSOLUTE_PATH accepts d:foo as
+   well, although it is only semi-absolute.  This is because the users
+   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
+   name like d:foo.  */
+#define IS_ABSOLUTE_PATH_1(dos_based, f)                \
+  (IS_DIR_SEPARATOR_1 (dos_based, (f)[0])               \
+   || HAS_DRIVE_SPEC_1 (dos_based, f))
 
 extern int filename_cmp (const char *s1, const char *s2);
 #define FILENAME_CMP(s1, s2)   filename_cmp(s1, s2)

diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index eb47537..cf4cdc4 100644 (file)
--- a/libiberty/ChangeLog
+++ b/libiberty/ChangeLog
@@ -1,3 +1,11 @@
+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>
 
        * regex.c (byte_re_match_2_internal): Avoid set but not used