summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--binutils/ChangeLog5
-rw-r--r--binutils/ar.c4
-rw-r--r--binutils/bucomm.c2
3 files changed, 8 insertions, 3 deletions
diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index 53d35509ab..44ee5dc392 100644
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,3 +1,8 @@
+2000-06-27 Alan Modra <alan@linuxcare.com.au>
+
+ * ar.c: Revert incorrect 2000-06-25 patch.
+ * bucomm.c: Likewise.
+
2000-06-25 Mark Elbrecht <snowball3@bigfoot.com>
* rdcoff (parse_coff_symbol): Treat GNU weak symbols as external.
diff --git a/binutils/ar.c b/binutils/ar.c
index c8179d469b..650092f449 100644
--- a/binutils/ar.c
+++ b/binutils/ar.c
@@ -310,7 +310,7 @@ normalize (file, abfd)
if (filename == NULL || (bslash != NULL && bslash > filename))
filename = bslash;
if (filename == NULL && file[0] != '\0' && file[1] == ':')
- filename = file + 2;
+ filename = file + 1;
}
#endif
if (filename != (char *) NULL)
@@ -395,7 +395,7 @@ main (argc, argv)
if (temp == NULL || (bslash != NULL && bslash > temp))
temp = bslash;
if (temp == NULL && program_name[0] != '\0' && program_name[1] == ':')
- temp = program_name + 2;
+ temp = program_name + 1;
}
#endif
if (temp == NULL)
diff --git a/binutils/bucomm.c b/binutils/bucomm.c
index a40a599ee3..86c327fd43 100644
--- a/binutils/bucomm.c
+++ b/binutils/bucomm.c
@@ -222,7 +222,7 @@ make_tempname (filename)
if (slash == NULL || (bslash != NULL && bslash > slash))
slash = bslash;
if (slash == NULL && filename[0] != '\0' && filename[1] == ':')
- slash = filename + 2;
+ slash = filename + 1;
}
#endif