Drop en_GB locale; it was more trouble than it was worth (e.g., different

[chaz/tar] / src / mangle.c

diff --git a/src/mangle.c b/src/mangle.c
index 559013135db711c69a7cd7b4bdaaf1205e2578a2..204bf7c74db0c25bcc646783853ceafce24b95cb 100644 (file)
--- a/src/mangle.c
+++ b/src/mangle.c
@@ -1,5 +1,5 @@
 /* Encode long filenames for GNU tar.
-   Copyright 1988, 1992, 1994, 1996, 1997, 1999 Free Software Foundation, Inc.
+   Copyright 1988, 92, 94, 96, 97, 99, 2000 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
@@ -17,6 +17,7 @@
 
 #include "system.h"
 #include "common.h"
+#include <quotearg.h>
 
 struct mangled
   {
@@ -27,12 +28,9 @@ struct mangled
     char normal[1];
   };
 
-/*---------------------------------------------------------------------.
-| Extract a GNUTYPE_NAMES record contents.  It seems that such are not |
-| produced anymore by GNU tar, but we leave the reading code around    |
-| nevertheless, for salvaging old tapes.                              |
-`---------------------------------------------------------------------*/
-
+/* Extract a GNUTYPE_NAMES record contents.  It seems that such are
+   not produced anymore by GNU tar, but we leave the reading code
+   around nevertheless, for salvaging old tapes.  */
 void
 extract_mangle (void)
 {
@@ -42,7 +40,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';
 
@@ -89,7 +87,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));
        }
@@ -108,8 +107,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 to %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));
        }