diff options
author | Tristan Gingold <gingold@adacore.com> | 2010-01-13 11:15:52 +0000 |
---|---|---|
committer | Tristan Gingold <gingold@adacore.com> | 2010-01-13 11:15:52 +0000 |
commit | 9e1f2a750a30e29080ff621dbc93d3341380cf6c (patch) | |
tree | 3b5b36cb4eeae8b512cedf9aeb890fb77179d2e7 /binutils/ar.c | |
parent | bcc9f87ac5fcbcc7d2fa3d8c8cdde22f4ffe76a6 (diff) | |
download | binutils-redhat-9e1f2a750a30e29080ff621dbc93d3341380cf6c.tar.gz |
2010-01-13 Tristan Gingold <gingold@adacore.com>
* ar.c (main): Use lbasename.
(normalize): Ditto.
* objdump.c (update_source_path): Ditto.
Diffstat (limited to 'binutils/ar.c')
-rw-r--r-- | binutils/ar.c | 35 |
1 files changed, 2 insertions, 33 deletions
diff --git a/binutils/ar.c b/binutils/ar.c index 6cdd1191d3..fd1b9ecd17 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; |