(read_and): Invoke apply_nonancestor_delayed_set_stat on file names

[chaz/tar] / src / mangle.c

diff --git a/src/mangle.c b/src/mangle.c
index 985847f73274dc0f2c7ea1977c47abafbf1feabc..2f3e7df448eebaf9dbee365920e4cb8c1f055613 100644 (file)
--- a/src/mangle.c
+++ b/src/mangle.c
@@ -16,11 +16,8 @@
    59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 #include "system.h"
-
-#include <time.h>
-time_t time ();
-
 #include "common.h"
+#include <quotearg.h>
 
 struct mangled
   {
@@ -31,10 +28,6 @@ struct mangled
     char normal[1];
   };
 
-/* Should use a hash table, etc. .  */
-struct mangled *first_mangle;
-int mangled_num = 0;
-
 /*---------------------------------------------------------------------.
 | Extract a GNUTYPE_NAMES record contents.  It seems that such are not |
 | produced anymore by GNU tar, but we leave the reading code around    |
@@ -50,7 +43,7 @@ extract_mangle (void)
   char *cursor = buffer;
 
   if (size != (size_t) size || size == (size_t) -1)
-    FATAL_ERROR ((0, 0, _("Memory exhausted")));
+    xalloc_die ();
 
   buffer[size] = '\0';
 
@@ -97,7 +90,8 @@ extract_mangle (void)
            next_cursor[-2] = '\0';
          unquote_string (name_end + 4);
          if (rename (name, name_end + 4))
-           ERROR ((0, errno, _("Cannot rename %s to %s"), name, name_end + 4));
+           ERROR ((0, errno, _("%s: Cannot rename to %s"),
+                   quotearg_colon (name), quote_n (1, name_end + 4)));
          else if (verbose_option)
            WARN ((0, 0, _("Renamed %s to %s"), name, name_end + 4));
        }
@@ -116,8 +110,8 @@ extract_mangle (void)
          unquote_string (name_end + 4);
          if (symlink (name, name_end + 4)
              && (unlink (name_end + 4) || symlink (name, name_end + 4)))
-           ERROR ((0, errno, _("Cannot symlink %s to %s"),
-                   name, name_end + 4));
+           ERROR ((0, errno, _("%s: Cannot symlink %s %s"),
+                   quotearg_colon (name), quote_n (1, name_end + 4)));
          else if (verbose_option)
            WARN ((0, 0, _("Symlinked %s to %s"), name, name_end + 4));
        }