X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Flist.c;h=b8a1b177dd2ea909bfed346cb49b56ed7779b935;hb=64cca92a1fbbda5e72887aa455e1a33a4106b8c3;hp=e2050fcb3637c232932f0066eace425a6ca14cee;hpb=ba2ef4d0752d3440fa449599cdd6def5c96bfbaf;p=chaz%2Ftar diff --git a/src/list.c b/src/list.c index e2050fc..b8a1b17 100644 --- a/src/list.c +++ b/src/list.c @@ -1,5 +1,8 @@ /* List a tar archive, with support routines for reading a tar archive. - Copyright 1988, 92,93,94,96,97,98,99, 2000 Free Software Foundation, Inc. + + Copyright (C) 1988, 1992, 1993, 1994, 1996, 1997, 1998, 1999, 2000, + 2001, 2003 Free Software Foundation, Inc. + Written by John Gilmore, on 1985-08-26. This program is free software; you can redistribute it and/or modify it @@ -22,21 +25,19 @@ #include "system.h" #include -#include -#ifndef time -time_t time (); -#endif - #include "common.h" #define max(a, b) ((a) < (b) ? (b) : (a)) union block *current_header; /* points to current archive header */ -struct stat current_stat; /* stat struct corresponding */ enum archive_format current_format; /* recognized format */ +union block *recent_long_name; /* recent long name header and contents */ +union block *recent_long_link; /* likewise, for long link */ +size_t recent_long_name_blocks; /* number of blocks in recent_long_name */ +size_t recent_long_link_blocks; /* likewise, for long link */ -static uintmax_t from_header PARAMS ((const char *, size_t, const char *, - uintmax_t, uintmax_t)); +static uintmax_t from_header (const char *, size_t, const char *, + uintmax_t, uintmax_t); /* Base 64 digits; see Internet RFC 2045 Table 1. */ static char const base_64_digits[64] = @@ -61,12 +62,9 @@ base64_init (void) base64_map[(int) base_64_digits[i]] = i; } -/*-----------------------------------. -| Main loop for reading an archive. | -`-----------------------------------*/ - +/* Main loop for reading an archive. */ void -read_and (void (*do_something) ()) +read_and (void (*do_something) (void)) { enum read_header status = HEADER_STILL_UNREAD; enum read_header prev_status; @@ -75,13 +73,17 @@ read_and (void (*do_something) ()) name_gather (); open_archive (ACCESS_READ); - while (1) + do { prev_status = status; - status = read_header (); + tar_stat_destroy (¤t_stat_info); + xheader_destroy (&extended_header); + + status = read_header (false); switch (status) { case HEADER_STILL_UNREAD: + case HEADER_SUCCESS_EXTENDED: abort (); case HEADER_SUCCESS: @@ -89,45 +91,33 @@ read_and (void (*do_something) ()) /* Valid header. We should decode next field (mode) first. Ensure incoming names are null terminated. */ - if (! name_match (current_file_name) + if (! name_match (current_stat_info.file_name) || (newer_mtime_option != TYPE_MINIMUM (time_t) /* FIXME: We get mtime now, and again later; this causes duplicate diagnostics if header.mtime is bogus. */ - && ((current_stat.st_mtime + && ((current_stat_info.stat.st_mtime = TIME_FROM_HEADER (current_header->header.mtime)) < newer_mtime_option)) - || excluded_name (current_file_name)) + || excluded_name (current_stat_info.file_name)) { - char save_typeflag = current_header->header.typeflag; - switch (save_typeflag) + switch (current_header->header.typeflag) { case GNUTYPE_VOLHDR: case GNUTYPE_MULTIVOL: case GNUTYPE_NAMES: break; - + case DIRTYPE: if (show_omitted_dirs_option) WARN ((0, 0, _("%s: Omitting"), - quotearg_colon (current_file_name))); + quotearg_colon (current_stat_info.file_name))); /* Fall through. */ default: - - /* Skip past it in the archive. */ - - set_next_block_after (current_header); - if (current_header->oldgnu_header.isextended) - skip_extended_headers (); - - /* Skip to the next header on the archive. */ - - if (save_typeflag != DIRTYPE) - skip_file (current_stat.st_size); + skip_member (); continue; } - } + } - apply_nonancestor_delayed_set_stat (current_file_name); (*do_something) (); continue; @@ -140,10 +130,19 @@ read_and (void (*do_something) ()) } set_next_block_after (current_header); + + if (!ignore_zeros_option) + { + char buf[UINTMAX_STRSIZE_BOUND]; + + status = read_header (false); + if (status == HEADER_ZERO_BLOCK) + break; + WARN ((0, 0, _("A lone zero block at %s"), + STRINGIFY_BIGINT (current_block_ordinal (), buf))); + } status = prev_status; - if (ignore_zeros_option) - continue; - break; + continue; case HEADER_END_OF_FILE: if (block_number_option) @@ -173,32 +172,29 @@ read_and (void (*do_something) ()) case HEADER_FAILURE: /* We are in the middle of a cascade of errors. */ break; + + case HEADER_SUCCESS_EXTENDED: + abort (); } continue; } break; } + while (!all_names_found (¤t_stat_info)); - apply_delayed_set_stat (); close_archive (); names_notfound (); /* print names not found */ } -/*---------------------------------------------. -| Print a header block, based on tar options. | -`---------------------------------------------*/ - +/* Print a header block, based on tar options. */ void list_archive (void) { /* Print the header block. */ + decode_header (current_header, ¤t_stat_info, ¤t_format, 0); if (verbose_option) - { - if (verbose_option > 1) - decode_header (current_header, ¤t_stat, ¤t_format, 0); - print_header (); - } + print_header (¤t_stat_info, -1); if (incremental_option && current_header->header.typeflag == GNUTYPE_DUMPDIR) { @@ -209,10 +205,10 @@ list_archive (void) set_next_block_after (current_header); if (multi_volume_option) { - assign_string (&save_name, current_file_name); - save_totsize = current_stat.st_size; + assign_string (&save_name, current_stat_info.file_name); + save_totsize = current_stat_info.stat.st_size; } - for (size = current_stat.st_size; size > 0; size -= written) + for (size = current_stat_info.stat.st_size; size > 0; size -= written) { if (multi_volume_option) save_sizeleft = size; @@ -231,7 +227,7 @@ list_archive (void) (data_block->buffer + written - 1)); if (check != written) { - write_error_details (current_file_name, check, written); + write_error_details (current_stat_info.file_name, check, written); skip_file (size - written); break; } @@ -244,34 +240,27 @@ list_archive (void) } - /* Skip past the header in the archive, and past any extended headers. */ - - set_next_block_after (current_header); - if (current_header->oldgnu_header.isextended) - skip_extended_headers (); - if (multi_volume_option) - assign_string (&save_name, current_file_name); - - /* Skip to the next header on the archive. */ + assign_string (&save_name, current_stat_info.file_name); - skip_file (current_stat.st_size); + skip_member (); if (multi_volume_option) assign_string (&save_name, 0); } -/*-----------------------------------------------------------------------. -| Read a block that's supposed to be a header block. Return its address | -| in "current_header", and if it is good, the file's size in | -| current_stat.st_size. | -| | -| Return 1 for success, 0 if the checksum is bad, EOF on eof, 2 for a | -| block full of zeros (EOF marker). | -| | -| You must always set_next_block_after(current_header) to skip past the | -| header which this routine reads. | -`-----------------------------------------------------------------------*/ +/* Read a block that's supposed to be a header block. Return its + address in "current_header", and if it is good, the file's size in + current_stat_info.stat.st_size. + + Return 1 for success, 0 if the checksum is bad, EOF on eof, 2 for a + block full of zeros (EOF marker). + + If RAW_EXTENDED_HEADERS is nonzero, do not automagically fold the + GNU long name and link headers into later headers. + + You must always set_next_block_after(current_header) to skip past + the header which this routine reads. */ /* The standard BSD tar sources create the checksum by adding up the bytes in the header as type char. I think the type char was unsigned @@ -283,7 +272,7 @@ list_archive (void) computes two checksums -- signed and unsigned. */ enum read_header -read_header (void) +read_header (bool raw_extended_headers) { size_t i; int unsigned_sum; /* the POSIX one :-) */ @@ -292,11 +281,14 @@ read_header (void) uintmax_t parsed_sum; char *p; union block *header; - char **longp; + union block *header_copy; char *bp; union block *data_block; size_t size, written; - static char *next_long_name, *next_long_link; + union block *next_long_name = 0; + union block *next_long_link = 0; + size_t next_long_name_blocks; + size_t next_long_link_blocks; while (1) { @@ -311,7 +303,7 @@ read_header (void) for (i = sizeof *header; i-- != 0;) { unsigned_sum += (unsigned char) *p; - signed_sum += signed_char (*p++); + signed_sum += (signed char) (*p++); } if (unsigned_sum == 0) @@ -322,7 +314,7 @@ read_header (void) for (i = sizeof header->header.chksum; i-- != 0;) { unsigned_sum -= (unsigned char) header->header.chksum[i]; - signed_sum -= signed_char (header->header.chksum[i]); + signed_sum -= (signed char) (header->header.chksum[i]); } unsigned_sum += ' ' * sizeof header->header.chksum; signed_sum += ' ' * sizeof header->header.chksum; @@ -342,184 +334,249 @@ read_header (void) /* Good block. Decode file size and return. */ if (header->header.typeflag == LNKTYPE) - current_stat.st_size = 0; /* links 0 size on tape */ + current_stat_info.stat.st_size = 0; /* links 0 size on tape */ else - current_stat.st_size = OFF_FROM_HEADER (header->header.size); + current_stat_info.stat.st_size = OFF_FROM_HEADER (header->header.size); if (header->header.typeflag == GNUTYPE_LONGNAME - || header->header.typeflag == GNUTYPE_LONGLINK) + || header->header.typeflag == GNUTYPE_LONGLINK + || header->header.typeflag == XHDTYPE + || header->header.typeflag == XGLTYPE) { - longp = ((header->header.typeflag == GNUTYPE_LONGNAME) - ? &next_long_name - : &next_long_link); - - set_next_block_after (header); - if (*longp) - free (*longp); - size = current_stat.st_size; - if (size != current_stat.st_size) - xalloc_die (); - bp = *longp = xmalloc (size); - - for (; size > 0; size -= written) + if (raw_extended_headers) + return HEADER_SUCCESS_EXTENDED; + else if (header->header.typeflag == GNUTYPE_LONGNAME + || header->header.typeflag == GNUTYPE_LONGLINK) { - data_block = find_next_block (); - if (! data_block) + size_t name_size = current_stat_info.stat.st_size; + size = name_size - name_size % BLOCKSIZE + 2 * BLOCKSIZE; + if (name_size != current_stat_info.stat.st_size + || size < name_size) + xalloc_die (); + + header_copy = xmalloc (size + 1); + + if (header->header.typeflag == GNUTYPE_LONGNAME) { - ERROR ((0, 0, _("Unexpected EOF in archive"))); - break; + if (next_long_name) + free (next_long_name); + next_long_name = header_copy; + next_long_name_blocks = size / BLOCKSIZE; } - written = available_space_after (data_block); - if (written > size) - written = size; - - memcpy (bp, data_block->buffer, written); - bp += written; - set_next_block_after ((union block *) - (data_block->buffer + written - 1)); - } + else + { + if (next_long_link) + free (next_long_link); + next_long_link = header_copy; + next_long_link_blocks = size / BLOCKSIZE; + } + + set_next_block_after (header); + *header_copy = *header; + bp = header_copy->buffer + BLOCKSIZE; + for (size -= BLOCKSIZE; size > 0; size -= written) + { + data_block = find_next_block (); + if (! data_block) + { + ERROR ((0, 0, _("Unexpected EOF in archive"))); + break; + } + written = available_space_after (data_block); + if (written > size) + written = size; + + memcpy (bp, data_block->buffer, written); + bp += written; + set_next_block_after ((union block *) + (data_block->buffer + written - 1)); + } + + *bp = '\0'; + } + else if (header->header.typeflag == XHDTYPE + || header->header.typeflag == XGLTYPE) + xheader_read (header, OFF_FROM_HEADER (header->header.size)); + /* Loop! */ } else { - char *name; - struct posix_header *h = ¤t_header->header; + char const *name; + struct posix_header const *h = ¤t_header->header; char namebuf[sizeof h->prefix + 1 + NAME_FIELD_SIZE + 1]; - name = next_long_name; - if (! name) + if (recent_long_name) + free (recent_long_name); + + if (next_long_name) + { + name = next_long_name->buffer + BLOCKSIZE; + recent_long_name = next_long_name; + recent_long_name_blocks = next_long_name_blocks; + } + else { /* Accept file names as specified by POSIX.1-1996 section 10.1.1. */ - int posix_header = strcmp (h->magic, TMAGIC) == 0; char *np = namebuf; - if (posix_header && h->prefix[0]) + if (h->prefix[0] && strcmp (h->magic, TMAGIC) == 0) { memcpy (np, h->prefix, sizeof h->prefix); np[sizeof h->prefix] = '\0'; np += strlen (np); *np++ = '/'; + + /* Prevent later references to current_header from + mistakenly treating this as an old GNU header. + This assignment invalidates h->prefix. */ + current_header->oldgnu_header.isextended = 0; } memcpy (np, h->name, sizeof h->name); np[sizeof h->name] = '\0'; name = namebuf; + recent_long_name = 0; + recent_long_name_blocks = 0; } - assign_string (¤t_file_name, name); - if (next_long_name) + assign_string (¤t_stat_info.orig_file_name, name); + assign_string (¤t_stat_info.file_name, name); + current_stat_info.had_trailing_slash = strip_trailing_slashes (current_stat_info.file_name); + + if (recent_long_link) + free (recent_long_link); + + if (next_long_link) { - free (next_long_name); - next_long_name = 0; + name = next_long_link->buffer + BLOCKSIZE; + recent_long_link = next_long_link; + recent_long_link_blocks = next_long_link_blocks; } - - name = next_long_link; - if (! name) + else { memcpy (namebuf, h->linkname, sizeof h->linkname); namebuf[sizeof h->linkname] = '\0'; name = namebuf; + recent_long_link = 0; + recent_long_link_blocks = 0; } - assign_string (¤t_link_name, name); - if (next_long_link) - { - free (next_long_link); - next_long_link = 0; - } + assign_string (¤t_stat_info.link_name, name); return HEADER_SUCCESS; } } } -/*-------------------------------------------------------------------------. -| Decode things from a file HEADER block into STAT_INFO, also setting | -| *FORMAT_POINTER depending on the header block format. If DO_USER_GROUP, | -| decode the user/group information (this is useful for extraction, but | -| waste time when merely listing). | -| | -| read_header() has already decoded the checksum and length, so we don't. | -| | -| This routine should *not* be called twice for the same block, since the | -| two calls might use different DO_USER_GROUP values and thus might end up | -| with different uid/gid for the two calls. If anybody wants the uid/gid | -| they should decode it first, and other callers should decode it without | -| uid/gid before calling a routine, e.g. print_header, that assumes | -| decoded data. | -`-------------------------------------------------------------------------*/ +#define ISOCTAL(c) ((c)>='0'&&(c)<='7') + +/* Decode things from a file HEADER block into STAT_INFO, also setting + *FORMAT_POINTER depending on the header block format. If + DO_USER_GROUP, decode the user/group information (this is useful + for extraction, but waste time when merely listing). + + read_header() has already decoded the checksum and length, so we don't. + This routine should *not* be called twice for the same block, since + the two calls might use different DO_USER_GROUP values and thus + might end up with different uid/gid for the two calls. If anybody + wants the uid/gid they should decode it first, and other callers + should decode it without uid/gid before calling a routine, + e.g. print_header, that assumes decoded data. */ void -decode_header (union block *header, struct stat *stat_info, +decode_header (union block *header, struct tar_stat_info *stat_info, enum archive_format *format_pointer, int do_user_group) { enum archive_format format; if (strcmp (header->header.magic, TMAGIC) == 0) - format = POSIX_FORMAT; + { + if (header->star_header.prefix[130] == 0 + && ISOCTAL (header->star_header.atime[0]) + && header->star_header.atime[11] == ' ' + && ISOCTAL (header->star_header.ctime[0]) + && header->star_header.ctime[11] == ' ') + format = STAR_FORMAT; + else if (extended_header.size) + format = POSIX_FORMAT; + else + format = USTAR_FORMAT; + } else if (strcmp (header->header.magic, OLDGNU_MAGIC) == 0) format = OLDGNU_FORMAT; else format = V7_FORMAT; *format_pointer = format; - stat_info->st_mode = MODE_FROM_HEADER (header->header.mode); - stat_info->st_mtime = TIME_FROM_HEADER (header->header.mtime); + stat_info->stat.st_mode = MODE_FROM_HEADER (header->header.mode); + stat_info->stat.st_mtime = TIME_FROM_HEADER (header->header.mtime); + assign_string (&stat_info->uname, header->header.uname); + assign_string (&stat_info->gname, header->header.gname); + stat_info->devmajor = MAJOR_FROM_HEADER (header->header.devmajor); + stat_info->devminor = MINOR_FROM_HEADER (header->header.devminor); + + stat_info->stat.st_atime = start_time; + stat_info->stat.st_ctime = start_time; if (format == OLDGNU_FORMAT && incremental_option) { - stat_info->st_atime = TIME_FROM_HEADER (header->oldgnu_header.atime); - stat_info->st_ctime = TIME_FROM_HEADER (header->oldgnu_header.ctime); + stat_info->stat.st_atime = TIME_FROM_HEADER (header->oldgnu_header.atime); + stat_info->stat.st_ctime = TIME_FROM_HEADER (header->oldgnu_header.ctime); } if (format == V7_FORMAT) { - stat_info->st_uid = UID_FROM_HEADER (header->header.uid); - stat_info->st_gid = GID_FROM_HEADER (header->header.gid); - stat_info->st_rdev = 0; + stat_info->stat.st_uid = UID_FROM_HEADER (header->header.uid); + stat_info->stat.st_gid = GID_FROM_HEADER (header->header.gid); + stat_info->stat.st_rdev = 0; } else { + + if (format == STAR_FORMAT) + { + stat_info->stat.st_atime = TIME_FROM_HEADER (header->star_header.atime); + stat_info->stat.st_ctime = TIME_FROM_HEADER (header->star_header.ctime); + } + if (do_user_group) { /* FIXME: Decide if this should somewhat depend on -p. */ if (numeric_owner_option || !*header->header.uname - || !uname_to_uid (header->header.uname, &stat_info->st_uid)) - stat_info->st_uid = UID_FROM_HEADER (header->header.uid); + || !uname_to_uid (header->header.uname, &stat_info->stat.st_uid)) + stat_info->stat.st_uid = UID_FROM_HEADER (header->header.uid); if (numeric_owner_option || !*header->header.gname - || !gname_to_gid (header->header.gname, &stat_info->st_gid)) - stat_info->st_gid = GID_FROM_HEADER (header->header.gid); + || !gname_to_gid (header->header.gname, &stat_info->stat.st_gid)) + stat_info->stat.st_gid = GID_FROM_HEADER (header->header.gid); } + switch (header->header.typeflag) { case BLKTYPE: - stat_info->st_rdev - = makedev (MAJOR_FROM_HEADER (header->header.devmajor), - MINOR_FROM_HEADER (header->header.devminor)); - break; - case CHRTYPE: - stat_info->st_rdev - = makedev (MAJOR_FROM_HEADER (header->header.devmajor), - MINOR_FROM_HEADER (header->header.devminor)); + stat_info->stat.st_rdev = makedev (stat_info->devmajor, stat_info->devminor); break; default: - stat_info->st_rdev = 0; + stat_info->stat.st_rdev = 0; } } -} -/*------------------------------------------------------------------------. -| Convert buffer at WHERE0 of size DIGS from external format to uintmax_t.| -| The data is of type TYPE. The buffer must represent a value in the | -| range -MINUS_MINVAL through MAXVAL. DIGS must be positive. | -`------------------------------------------------------------------------*/ + current_stat_info.archive_file_size = current_stat_info.stat.st_size; + if (extended_header.size) + xheader_decode (stat_info); +} +/* Convert buffer at WHERE0 of size DIGS from external format to + uintmax_t. The data is of type TYPE. The buffer must represent a + value in the range -MINUS_MINVAL through MAXVAL. DIGS must be + positive. Return -1 on error, diagnosing the error if TYPE is + nonzero. */ static uintmax_t from_header (char const *where0, size_t digs, char const *type, uintmax_t minus_minval, uintmax_t maxval) @@ -569,7 +626,7 @@ from_header (char const *where0, size_t digs, char const *type, nonzero digit is 1, we can't recover the original value reliably; so do this only if the digit is 2 or more. This catches the common case of 32-bit negative time stamps. */ - if ((overflow || maxval < value) && '2' <= *where1) + if ((overflow || maxval < value) && '2' <= *where1 && type) { /* Compute the negative of the input value, assuming two's complement. */ @@ -601,76 +658,76 @@ from_header (char const *where0, size_t digs, char const *type, if (overflow) { - ERROR ((0, 0, - _("Archive octal value %.*s is out of %s range"), - (int) (where - where1), where1, type)); + if (type) + ERROR ((0, 0, + _("Archive octal value %.*s is out of %s range"), + (int) (where - where1), where1, type)); return -1; } } - else if (type) + else if (*where == '-' || *where == '+') { - /* The following forms cannot appear as checksums, so we don't - check for them if TYPE is null. */ - - if (*where == '-' || *where == '+') + /* Parse base-64 output produced only by tar test versions + 1.13.6 (1999-08-11) through 1.13.11 (1999-08-23). + Support for this will be withdrawn in future releases. */ + int dig; + static int warned_once; + if (! warned_once) { - /* Parse base-64 output produced only by tar test versions - 1.13.6 (1999-08-11) through 1.13.11 (1999-08-23). - Support for this will be withdrawn in future releases. */ - int dig; - static int warned_once; - if (! warned_once) - { - warned_once = 1; - WARN ((0, 0, - _("Archive contains obsolescent base-64 headers"))); - } - negative = *where++ == '-'; - while (where != lim - && (dig = base64_map[(unsigned char) *where]) < 64) + warned_once = 1; + WARN ((0, 0, + _("Archive contains obsolescent base-64 headers"))); + } + negative = *where++ == '-'; + while (where != lim + && (dig = base64_map[(unsigned char) *where]) < 64) + { + if (value << LG_64 >> LG_64 != value) { - if (value << LG_64 >> LG_64 != value) - { - ERROR ((0, 0, - _("Archive signed base-64 string `%.*s' is out of %s range"), - (int) digs, where0, type)); - return -1; - } - value = (value << LG_64) | dig; - where++; + char *string = alloca (digs + 1); + memcpy (string, where0, digs); + string[digs] = '\0'; + if (type) + ERROR ((0, 0, + _("Archive signed base-64 string %s is out of %s range"), + quote (string), type)); + return -1; } + value = (value << LG_64) | dig; + where++; } - else if (*where == '\200' /* positive base-256 */ - || *where == '\377' /* negative base-256 */) + } + else if (*where == '\200' /* positive base-256 */ + || *where == '\377' /* negative base-256 */) + { + /* Parse base-256 output. A nonnegative number N is + represented as (256**DIGS)/2 + N; a negative number -N is + represented as (256**DIGS) - N, i.e. as two's complement. + The representation guarantees that the leading bit is + always on, so that we don't confuse this format with the + others (assuming ASCII bytes of 8 bits or more). */ + int signbit = *where & (1 << (LG_256 - 2)); + uintmax_t topbits = (((uintmax_t) - signbit) + << (CHAR_BIT * sizeof (uintmax_t) + - LG_256 - (LG_256 - 2))); + value = (*where++ & ((1 << (LG_256 - 2)) - 1)) - signbit; + for (;;) { - /* Parse base-256 output. A nonnegative number N is - represented as (256**DIGS)/2 + N; a negative number -N is - represented as (256**DIGS) - N, i.e. as two's complement. - The representation guarantees that the leading bit is - always on, so that we don't confuse this format with the - others (assuming ASCII bytes of 8 bits or more). */ - int signbit = *where & (1 << (LG_256 - 2)); - uintmax_t topbits = (((uintmax_t) - signbit) - << (CHAR_BIT * sizeof (uintmax_t) - - LG_256 - (LG_256 - 2))); - value = (*where++ & ((1 << (LG_256 - 2)) - 1)) - signbit; - for (;;) + value = (value << LG_256) + (unsigned char) *where++; + if (where == lim) + break; + if (((value << LG_256 >> LG_256) | topbits) != value) { - value = (value << LG_256) + (unsigned char) *where++; - if (where == lim) - break; - if (((value << LG_256 >> LG_256) | topbits) != value) - { - ERROR ((0, 0, - _("Archive base-256 value is out of %s range"), - type)); - return -1; - } + if (type) + ERROR ((0, 0, + _("Archive base-256 value is out of %s range"), + type)); + return -1; } - negative = signbit; - if (negative) - value = -value; } + negative = signbit; + if (negative) + value = -value; } if (where != lim && *where && !ISSPACE ((unsigned char) *where)) @@ -711,7 +768,7 @@ from_header (char const *where0, size_t digs, char const *type, *--value_string = '-'; if (minus_minval) *--minval_string = '-'; - ERROR ((0, 0, _("Archive value %s is out of %s range %s..%s"), + ERROR ((0, 0, _("Archive value %s is out of %s range %s.%s"), value_string, type, minval_string, STRINGIFY_BIGINT (maxval, maxval_buf))); } @@ -776,19 +833,16 @@ off_from_header (const char *p, size_t s) size_t size_from_header (const char *p, size_t s) { - return from_header (p, s, "size_t", (uintmax_t) 0, + return from_header (p, s, "size_t", (uintmax_t) 0, (uintmax_t) TYPE_MAXIMUM (size_t)); } time_t time_from_header (const char *p, size_t s) { - time_t t = from_header (p, s, "time_t", - - (uintmax_t) TYPE_MINIMUM (time_t), - (uintmax_t) TYPE_MAXIMUM (time_t)); - if (start_time < t && time (0) < t) - WARN ((0, 0, _("Archive contains future timestamp %s"), tartime (t))); - return t; + return from_header (p, s, "time_t", + - (uintmax_t) TYPE_MINIMUM (time_t), + (uintmax_t) TYPE_MAXIMUM (time_t)); } uid_t @@ -807,10 +861,8 @@ uintmax_from_header (const char *p, size_t s) } -/*----------------------------------------------------------------------. -| Format O as a null-terminated decimal string into BUF _backwards_; | -| return pointer to start of result. | -`----------------------------------------------------------------------*/ +/* Format O as a null-terminated decimal string into BUF _backwards_; + return pointer to start of result. */ char * stringify_uintmax_t_backwards (uintmax_t o, char *buf) { @@ -836,8 +888,8 @@ tartime (time_t t) if (p) { char const *time_stamp = p + 4; - for (p += 16; p[4] != '\n'; p++) - p[0] = p[4]; + for (p += 16; p[3] != '\n'; p++) + p[0] = p[3]; p[0] = '\0'; return time_stamp; } @@ -847,8 +899,8 @@ tartime (time_t t) struct tm *tm = localtime (&t); if (tm) { - sprintf (buffer, "%04d-%02d-%02d %02d:%02d:%02d", - tm->tm_year + 1900, tm->tm_mon + 1, tm->tm_mday, + sprintf (buffer, "%04ld-%02d-%02d %02d:%02d:%02d", + tm->tm_year + 1900L, tm->tm_mon + 1, tm->tm_mday, tm->tm_hour, tm->tm_min, tm->tm_sec); return buffer; } @@ -867,19 +919,18 @@ tartime (time_t t) return p; } -/*-------------------------------------------------------------------------. -| Actually print it. | -| | -| Plain and fancy file header block logging. Non-verbose just prints the | -| name, e.g. for "tar t" or "tar x". This should just contain file names, | -| so it can be fed back into tar with xargs or the "-T" option. The | -| verbose option can give a bunch of info, one line per file. I doubt | -| anybody tries to parse its format, or if they do, they shouldn't. Unix | -| tar is pretty random here anyway. | -`-------------------------------------------------------------------------*/ +/* Actually print it. + + Plain and fancy file header block logging. Non-verbose just prints + the name, e.g. for "tar t" or "tar x". This should just contain + file names, so it can be fed back into tar with xargs or the "-T" + option. The verbose option can give a bunch of info, one line per + file. I doubt anybody tries to parse its format, or if they do, + they shouldn't. Unix tar is pretty random here anyway. */ + /* FIXME: Note that print_header uses the globals HEAD, HSTAT, and - HEAD_STANDARD, which must be set up in advance. Not very clean... */ + HEAD_STANDARD, which must be set up in advance. Not very clean.. */ /* UGSWIDTH starts with 18, so with user and group names <= 8 chars, the columns never shift during the listing. */ @@ -894,10 +945,12 @@ static int ugswidth = UGSWIDTH; /* maximum width encountered so far */ #endif void -print_header (void) +print_header (struct tar_stat_info *st, off_t block_ordinal) { char modes[11]; char const *time_stamp; + char *temp_name = st->orig_file_name ? st->orig_file_name : st->file_name; + /* These hold formatted ints. */ char uform[UINTMAX_STRSIZE_BOUND], gform[UINTMAX_STRSIZE_BOUND]; char *user, *group; @@ -909,14 +962,18 @@ print_header (void) if (block_number_option) { char buf[UINTMAX_STRSIZE_BOUND]; + if (block_ordinal < 0) + block_ordinal = current_block_ordinal (); + block_ordinal -= recent_long_name_blocks; + block_ordinal -= recent_long_link_blocks; fprintf (stdlis, _("block %s: "), - STRINGIFY_BIGINT (current_block_ordinal (), buf)); + STRINGIFY_BIGINT (block_ordinal, buf)); } if (verbose_option <= 1) { /* Just the fax, mam. */ - fprintf (stdlis, "%s\n", quotearg (current_file_name)); + fprintf (stdlis, "%s\n", quotearg (temp_name)); } else { @@ -939,17 +996,20 @@ print_header (void) case GNUTYPE_LONGNAME: case GNUTYPE_LONGLINK: + modes[0] = 'L'; ERROR ((0, 0, _("Visible longname error"))); break; case GNUTYPE_SPARSE: case REGTYPE: case AREGTYPE: - case LNKTYPE: modes[0] = '-'; - if (current_file_name[strlen (current_file_name) - 1] == '/') + if (temp_name[strlen (temp_name) - 1] == '/') modes[0] = 'd'; break; + case LNKTYPE: + modes[0] = 'h'; + break; case GNUTYPE_DUMPDIR: modes[0] = 'd'; break; @@ -973,29 +1033,57 @@ print_header (void) break; } - decode_mode (current_stat.st_mode, modes + 1); + decode_mode (st->stat.st_mode, modes + 1); /* Time stamp. */ - time_stamp = tartime (current_stat.st_mtime); + time_stamp = tartime (st->stat.st_mtime); /* User and group names. */ - if (*current_header->header.uname && current_format != V7_FORMAT + if (st->uname && current_format != V7_FORMAT && !numeric_owner_option) - user = current_header->header.uname; + user = st->uname; else - user = STRINGIFY_BIGINT (UINTMAX_FROM_HEADER - (current_header->header.uid), - uform); + { + /* Try parsing it as an unsigned integer first, and as a + uid_t if that fails. This method can list positive user + ids that are too large to fit in a uid_t. */ + uintmax_t u = from_header (current_header->header.uid, + sizeof current_header->header.uid, 0, + (uintmax_t) 0, + (uintmax_t) TYPE_MAXIMUM (uintmax_t)); + if (u != -1) + user = STRINGIFY_BIGINT (u, uform); + else + { + sprintf (uform, "%ld", + (long) UID_FROM_HEADER (current_header->header.uid)); + user = uform; + } + } - if (*current_header->header.gname && current_format != V7_FORMAT + if (st->gname && current_format != V7_FORMAT && !numeric_owner_option) - group = current_header->header.gname; + group = st->gname; else - group = STRINGIFY_BIGINT (UINTMAX_FROM_HEADER - (current_header->header.gid), - gform); + { + /* Try parsing it as an unsigned integer first, and as a + gid_t if that fails. This method can list positive group + ids that are too large to fit in a gid_t. */ + uintmax_t g = from_header (current_header->header.gid, + sizeof current_header->header.gid, 0, + (uintmax_t) 0, + (uintmax_t) TYPE_MAXIMUM (uintmax_t)); + if (g != -1) + group = STRINGIFY_BIGINT (g, gform); + else + { + sprintf (gform, "%ld", + (long) GID_FROM_HEADER (current_header->header.gid)); + group = gform; + } + } /* Format the file size or major/minor device numbers. */ @@ -1004,10 +1092,10 @@ print_header (void) case CHRTYPE: case BLKTYPE: strcpy (size, - STRINGIFY_BIGINT (major (current_stat.st_rdev), uintbuf)); + STRINGIFY_BIGINT (major (st->stat.st_rdev), uintbuf)); strcat (size, ","); strcat (size, - STRINGIFY_BIGINT (minor (current_stat.st_rdev), uintbuf)); + STRINGIFY_BIGINT (minor (st->stat.st_rdev), uintbuf)); break; case GNUTYPE_SPARSE: strcpy (size, @@ -1017,7 +1105,8 @@ print_header (void) uintbuf)); break; default: - strcpy (size, STRINGIFY_BIGINT (current_stat.st_size, uintbuf)); + /* st->stat.st_size keeps stored file size */ + strcpy (size, STRINGIFY_BIGINT (st->archive_file_size, uintbuf)); break; } @@ -1030,21 +1119,26 @@ print_header (void) fprintf (stdlis, "%s %s/%s %*s%s %s", modes, user, group, ugswidth - pad, "", size, time_stamp); - fprintf (stdlis, " %s", quotearg (current_file_name)); + fprintf (stdlis, " %s", quotearg (temp_name)); switch (current_header->header.typeflag) { case SYMTYPE: - fprintf (stdlis, " -> %s\n", quotearg (current_link_name)); + fprintf (stdlis, " -> %s\n", quotearg (st->link_name)); break; case LNKTYPE: - fprintf (stdlis, _(" link to %s\n"), quotearg (current_link_name)); + fprintf (stdlis, _(" link to %s\n"), quotearg (st->link_name)); break; default: - fprintf (stdlis, _(" unknown file type `%c'\n"), - current_header->header.typeflag); + { + char type_string[2]; + type_string[0] = current_header->header.typeflag; + type_string[1] = '\0'; + fprintf (stdlis, _(" unknown file type %s\n"), + quote (type_string)); + } break; case AREGTYPE: @@ -1059,6 +1153,14 @@ print_header (void) putc ('\n', stdlis); break; + case GNUTYPE_LONGLINK: + fprintf (stdlis, _("--Long Link--\n")); + break; + + case GNUTYPE_LONGNAME: + fprintf (stdlis, _("--Long Name--\n")); + break; + case GNUTYPE_VOLHDR: fprintf (stdlis, _("--Volume Header--\n")); break; @@ -1079,10 +1181,7 @@ print_header (void) fflush (stdlis); } -/*--------------------------------------------------------------. -| Print a similar line when we make a directory automatically. | -`--------------------------------------------------------------*/ - +/* Print a similar line when we make a directory automatically. */ void print_for_mkdir (char *pathname, int length, mode_t mode) { @@ -1107,10 +1206,7 @@ print_for_mkdir (char *pathname, int length, mode_t mode) } } -/*--------------------------------------------------------. -| Skip over SIZE bytes of data in blocks in the archive. | -`--------------------------------------------------------*/ - +/* Skip over SIZE bytes of data in blocks in the archive. */ void skip_file (off_t size) { @@ -1135,21 +1231,27 @@ skip_file (off_t size) } } -/*---. -| ? | -`---*/ - +/* Skip the current member in the archive. */ void -skip_extended_headers (void) +skip_member (void) { - union block *exhdr; + char save_typeflag = current_header->header.typeflag; + set_next_block_after (current_header); - do + if (current_format == OLDGNU_FORMAT + && current_header->oldgnu_header.isextended) { - exhdr = find_next_block (); - if (!exhdr) - FATAL_ERROR ((0, 0, _("Unexpected EOF in archive"))); - set_next_block_after (exhdr); + union block *exhdr; + do + { + exhdr = find_next_block (); + if (!exhdr) + FATAL_ERROR ((0, 0, _("Unexpected EOF in archive"))); + set_next_block_after (exhdr); + } + while (exhdr->sparse_header.isextended); } - while (exhdr->sparse_header.isextended); + + if (save_typeflag != DIRTYPE) + skip_file (current_stat_info.stat.st_size); }