Revert incorrect 2000-06-25 patch.

diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index 53d3550..44ee5dc 100644 (file)
--- 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 c8179d4..650092f 100644 (file)
--- 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 a40a599..86c327f 100644 (file)
--- 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