X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;ds=sidebyside;f=src%2Fmangle.c;h=ca8de64fee30b0395bbb24dff72f8102b8e9a60e;hb=73266a46f3861d780d1e5e870e56fd73648af707;hp=f6d57ba6329d7faf00ed0d2bd70b89c09ea73ef4;hpb=984190dcc691e1255b7ed08eb1379318f599ab3d;p=chaz%2Ftar diff --git a/src/mangle.c b/src/mangle.c index f6d57ba..ca8de64 100644 --- 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 @@ -16,13 +16,8 @@ 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #include "system.h" - -#include -#ifndef time -time_t time (); -#endif - #include "common.h" +#include struct mangled { @@ -33,10 +28,6 @@ struct mangled char normal[1]; }; -/* Should use a hash table, etc. . */ -static struct mangled *first_mangle; -static int mangled_num; - /*---------------------------------------------------------------------. | Extract a GNUTYPE_NAMES record contents. It seems that such are not | | produced anymore by GNU tar, but we leave the reading code around | @@ -52,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'; @@ -99,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)); } @@ -118,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)); }