aboutsummaryrefslogtreecommitdiff
path: root/binutils
diff options
context:
space:
mode:
Diffstat (limited to 'binutils')
-rw-r--r--binutils/ChangeLog6
-rw-r--r--binutils/ar.c35
-rw-r--r--binutils/objdump.c16
3 files changed, 9 insertions, 48 deletions
diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index 9483dab..82d912f 100644
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,3 +1,9 @@
+2010-01-13 Tristan Gingold <gingold@adacore.com>
+
+ * ar.c (main): Use lbasename.
+ (normalize): Ditto.
+ * objdump.c (update_source_path): Ditto.
+
2010-01-12 Tristan Gingold <gingold@adacore.com>
* makefile.vms (CFLAGS): Turns warnings into informational messages.
diff --git a/binutils/ar.c b/binutils/ar.c
index 6cdd119..fd1b9ec 100644
--- a/binutils/ar.c
+++ b/binutils/ar.c
@@ -303,22 +303,7 @@ normalize (const char *file, bfd *abfd)
if (full_pathname)
return file;
- filename = strrchr (file, '/');
-#ifdef HAVE_DOS_BASED_FILE_SYSTEM
- {
- /* We could have foo/bar\\baz, or foo\\bar, or d:bar. */
- char *bslash = strrchr (file, '\\');
-
- if (filename == NULL || (bslash != NULL && bslash > filename))
- filename = bslash;
- if (filename == NULL && file[0] != '\0' && file[1] == ':')
- filename = file + 1;
- }
-#endif
- if (filename != (char *) NULL)
- filename++;
- else
- filename = file;
+ filename = lbasename (file);
if (ar_truncate
&& abfd != NULL
@@ -397,24 +382,8 @@ main (int argc, char **argv)
if (is_ranlib < 0)
{
- char *temp;
-
- temp = strrchr (program_name, '/');
-#ifdef HAVE_DOS_BASED_FILE_SYSTEM
- {
- /* We could have foo/bar\\baz, or foo\\bar, or d:bar. */
- char *bslash = strrchr (program_name, '\\');
+ const char *temp = lbasename (program_name);
- if (temp == NULL || (bslash != NULL && bslash > temp))
- temp = bslash;
- if (temp == NULL && program_name[0] != '\0' && program_name[1] == ':')
- temp = program_name + 1;
- }
-#endif
- if (temp == NULL)
- temp = program_name;
- else
- ++temp;
if (strlen (temp) >= 6
&& FILENAME_CMP (temp + strlen (temp) - 6, "ranlib") == 0)
is_ranlib = 1;
diff --git a/binutils/objdump.c b/binutils/objdump.c
index 79be665..0334d70 100644
--- a/binutils/objdump.c
+++ b/binutils/objdump.c
@@ -1156,21 +1156,7 @@ update_source_path (const char *filename)
return NULL;
/* Get the name of the file. */
- fname = strrchr (filename, '/');
-#ifdef HAVE_DOS_BASED_FILE_SYSTEM
- {
- /* We could have a mixed forward/back slash case. */
- char *backslash = strrchr (filename, '\\');
- if (fname == NULL || (backslash != NULL && backslash > fname))
- fname = backslash;
- if (fname == NULL && filename[0] != '\0' && filename[1] == ':')
- fname = filename + 1;
- }
-#endif
- if (fname == NULL)
- fname = filename;
- else
- ++fname;
+ fname = lbasename (filename);
/* If file exists under a new path, we need to add it to the list
so that show_line knows about it. */