Update FSF postal mail address.

[chaz/tar] / src / mangle.c

diff --git a/src/mangle.c b/src/mangle.c
index 03377dc66df0f96fe279a8ccffb64b8e1e805f3d..fe37f6466c00643ca472726a579d191bd5024f51 100644 (file)
--- a/src/mangle.c
+++ b/src/mangle.c
@@ -1,5 +1,5 @@
 /* Encode long filenames for GNU tar.
-   Copyright (C) 1988, 1992, 1994, 1996, 1997 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
@@ -13,14 +13,11 @@
 
    You should have received a copy of the GNU General Public License along
    with this program; if not, write to the Free Software Foundation, Inc.,
-   59 Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-#include "system.h"
-
-#include <time.h>
-time_t time ();
+   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
+#include <system.h>
 #include "common.h"
+#include <quotearg.h>
 
 struct mangled
   {
@@ -31,30 +28,26 @@ 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    |
-| 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)
 {
-  int size = current_stat.st_size;
+  off_t size = current_stat_info.stat.st_size;
   char *buffer = xmalloc ((size_t) (size + 1));
   char *copy = buffer;
   char *cursor = buffer;
 
+  if (size != (size_t) size || size == (size_t) -1)
+    xalloc_die ();
+
   buffer[size] = '\0';
 
   while (size > 0)
     {
       union block *block = find_next_block ();
-      int available;
+      size_t available;
 
       if (!block)
        {
@@ -64,7 +57,7 @@ extract_mangle (void)
       available = available_space_after (block);
       if (available > size)
        available = size;
-      memcpy (copy, block->buffer, (size_t) available);
+      memcpy (copy, block->buffer, available);
       copy += available;
       size -= available;
       set_next_block_after ((union block *) (block->buffer + available - 1));
@@ -94,11 +87,12 @@ 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));
        }
-#ifdef S_ISLNK
+#ifdef HAVE_SYMLINK
       else if (!strncmp (cursor, "Symlink ", 8))
        {
          name = cursor + 8;
@@ -113,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));
        }