X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fmangle.c;h=fe37f6466c00643ca472726a579d191bd5024f51;hb=38f08784bc95745e0c5e8308d098c3bc89cc9ba5;hp=2f3e7df448eebaf9dbee365920e4cb8c1f055613;hpb=f2b8b4a42da21d48aff58aa2993fd64852844f8a;p=chaz%2Ftar diff --git a/src/mangle.c b/src/mangle.c index 2f3e7df..fe37f64 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 @@ -13,9 +13,9 @@ 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 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include "system.h" +#include #include "common.h" #include @@ -28,16 +28,13 @@ 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) { - off_t 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; @@ -110,7 +107,7 @@ 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, _("%s: Cannot symlink %s %s"), + 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));