* arlex.l: Accept `\' in filenames. Patch by <earl_chew@agilent.com>.

	* arsup.c (ar_open): Prepend tmp- to basename, not whole path.

diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index 11f2b78..bc8fc57 100644 (file)
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,3 +1,9 @@
+2001-11-05  Jakub Jelinek  <jakub@redhat.com>
+
+       * arlex.l: Accept `\' in filenames.  Patch by <earl_chew@agilent.com>.
+
+       * arsup.c (ar_open): Prepend tmp- to basename, not whole path.
+
 2001-11-05  Martin Schwidefsky  <schwidefsky@de.ibm.com>
 
        * MAINTAINERS: Add self as s390/s390x maintainer.

diff --git a/binutils/arlex.l b/binutils/arlex.l
index 71ef56e..4e2895c 100644 (file)
--- a/binutils/arlex.l
+++ b/binutils/arlex.l
@@ -71,7 +71,7 @@ int linenumber;
 "("             { return '('; }
 ")"             { return ')'; }
 ","             { return ','; }
-[A-Za-z0-9/$:.\-\_]+  {        
+[A-Za-z0-9/\\$:.\-\_]+  {      
                yylval.name =  xstrdup (yytext);
                return FILENAME;
                }

diff --git a/binutils/arsup.c b/binutils/arsup.c
index 0058c0d..1e86479 100644 (file)
--- a/binutils/arsup.c
+++ b/binutils/arsup.c
@@ -160,10 +160,11 @@ DEFUN(ar_open,(name, t),
 
 {
   char *tname = (char *) xmalloc (strlen (name) + 10);
+  const char *bname = lbasename (name);
   real_name = name;
   /* Prepend tmp- to the beginning, to avoid file-name clashes after
      truncation on filesystems with limited namespaces (DOS).  */
-  sprintf(tname, "tmp-%s", name);
+  sprintf(tname, "%.*stmp-%s", (int) (bname - name), name, bname);
   obfd = bfd_openw(tname, NULL);
 
   if (!obfd) {