aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDJ Delorie <dj@redhat.com>2010-04-24 01:03:21 +0000
committerDJ Delorie <dj@redhat.com>2010-04-24 01:03:21 +0000
commit2cd2156f48361fa342ce1ad18cead5cae6ce4af5 (patch)
treeb8420cdb82b96deb0b0dd9c0544c34da6c3d0280
parent65730243397a2680bfb31b18d32c366f450a78d1 (diff)
downloadgdb-2cd2156f48361fa342ce1ad18cead5cae6ce4af5.zip
gdb-2cd2156f48361fa342ce1ad18cead5cae6ce4af5.tar.gz
gdb-2cd2156f48361fa342ce1ad18cead5cae6ce4af5.tar.bz2
merge from gcc
-rw-r--r--include/ChangeLog22
-rw-r--r--include/filenames.h52
-rw-r--r--include/libiberty.h11
-rw-r--r--libiberty/ChangeLog8
-rw-r--r--libiberty/Makefile.in2
-rw-r--r--libiberty/lbasename.c28
6 files changed, 98 insertions, 25 deletions
diff --git a/include/ChangeLog b/include/ChangeLog
index 6c57a4f..4ecae89 100644
--- a/include/ChangeLog
+++ b/include/ChangeLog
@@ -1,3 +1,25 @@
+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.
+
2010-04-15 Nick Clifton <nickc@redhat.com>
* bout.h: Update copyright notice to use GPLv3.
diff --git a/include/filenames.h b/include/filenames.h
index d5e34a0..ff4e5ac 100644
--- a/include/filenames.h
+++ b/include/filenames.h
@@ -31,34 +31,46 @@ extern "C" {
#endif
#if defined(__MSDOS__) || defined(_WIN32) || defined(__OS2__) || defined (__CYGWIN__)
-
-#ifndef HAVE_DOS_BASED_FILE_SYSTEM
-#define HAVE_DOS_BASED_FILE_SYSTEM 1
+# 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))
-
-#else /* not DOSish */
-
-#define IS_DIR_SEPARATOR(c) ((c) == '/')
-#define IS_ABSOLUTE_PATH(f) (IS_DIR_SEPARATOR((f)[0]))
-
-#define HAS_DRIVE_SPEC(f) (0)
-#define STRIP_DRIVE_SPEC(f) (f)
-
-#endif /* not DOSish */
+#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)
+
+#define IS_UNIX_DIR_SEPARATOR(c) IS_DIR_SEPARATOR_1 (0, c)
+#define IS_UNIX_ABSOLUTE_PATH(f) IS_ABSOLUTE_PATH_1 (0, f)
+
+/* 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/include/libiberty.h b/include/libiberty.h
index a7716e4..b320b18 100644
--- a/include/libiberty.h
+++ b/include/libiberty.h
@@ -116,6 +116,17 @@ extern char *basename (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. */
extern char *lrealpath (const char *);
diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index eb47537..cf4cdc4 100644
--- 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
diff --git a/libiberty/Makefile.in b/libiberty/Makefile.in
index f22d3a3..fbce3cd 100644
--- a/libiberty/Makefile.in
+++ b/libiberty/Makefile.in
@@ -724,7 +724,7 @@ $(CONFIGURED_OFILES): stamp-picdir
./lbasename.o: $(srcdir)/lbasename.c config.h $(INCDIR)/ansidecl.h \
$(INCDIR)/filenames.h $(INCDIR)/libiberty.h \
- $(INCDIR)/safe-ctype.h
+ $(INCDIR)/safe-ctype.h $(INCDIR)/filenames.h
if [ x"$(PICFLAG)" != x ]; then \
$(COMPILE.c) $(PICFLAG) $(srcdir)/lbasename.c -o pic/$@; \
else true; fi
diff --git a/libiberty/lbasename.c b/libiberty/lbasename.c
index 56fcd62..ed1dd1f 100644
--- a/libiberty/lbasename.c
+++ b/libiberty/lbasename.c
@@ -46,19 +46,39 @@ and a path ending in @code{/} returns the empty string after it.
#include "filenames.h"
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;
-#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
/* Skip over a possible disk name. */
if (ISALPHA (name[0]) && name[1] == ':')
name += 2;
-#endif
for (base = name; *name; name++)
- if (IS_DIR_SEPARATOR (*name))
+ if (IS_DOS_DIR_SEPARATOR (*name))
base = name + 1;
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
+}