aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorDoug Evans <dje@google.com>2010-04-14 21:18:27 +0000
committerDoug Evans <dje@google.com>2010-04-14 21:18:27 +0000
commit58cd914490d61122a43746f5610542798ba6f3e7 (patch)
treefed5d5c4792384aaa8a98852fdb8aefc9d2cb501 /include
parent516ba659387ce98c4ff28b88a7f00f5003cac9eb (diff)
downloadgdb-58cd914490d61122a43746f5610542798ba6f3e7.zip
gdb-58cd914490d61122a43746f5610542798ba6f3e7.tar.gz
gdb-58cd914490d61122a43746f5610542798ba6f3e7.tar.bz2
* filenames.h (HAS_DRIVE_SPEC, STRIP_DRIVE_SPEC): New macros.
Diffstat (limited to 'include')
-rw-r--r--include/ChangeLog4
-rw-r--r--include/filenames.h14
2 files changed, 16 insertions, 2 deletions
diff --git a/include/ChangeLog b/include/ChangeLog
index e8f3717..491bbad 100644
--- a/include/ChangeLog
+++ b/include/ChangeLog
@@ -1,3 +1,7 @@
+2010-04-14 Doug Evans <dje@google.com>
+
+ * filenames.h (HAS_DRIVE_SPEC, STRIP_DRIVE_SPEC): New macros.
+
2010-04-05 Jakub Jelinek <jakub@redhat.com>
* dwarf2.h (DWARF2_Internal_LineInfo): Add li_max_ops_per_insn
diff --git a/include/filenames.h b/include/filenames.h
index 0d411cc..d5e34a0 100644
--- a/include/filenames.h
+++ b/include/filenames.h
@@ -5,7 +5,7 @@
use forward- and back-slash in path names interchangeably, and
some of them have case-insensitive file names.
- Copyright 2000, 2001, 2007 Free Software Foundation, Inc.
+ Copyright 2000, 2001, 2007, 2010 Free Software Foundation, Inc.
This file is part of BFD, the Binary File Descriptor library.
@@ -37,17 +37,27 @@ extern "C" {
#endif
#define IS_DIR_SEPARATOR(c) ((c) == '/' || (c) == '\\')
+
+#define HAS_DRIVE_SPEC(f) (((f)[0]) && ((f)[1] == ':'))
+
+/* 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]) || (((f)[0]) && ((f)[1] == ':')))
+#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 */
extern int filename_cmp (const char *s1, const char *s2);