X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Flist.c;h=e56e7dce930d5e42c92aff77a1857c37fa1b6192;hb=5c35fdb275b519373e6eb34621d956d09a52bf31;hp=61a3f85f7b738e8b0e1075cdaa0f2ae5938d0b4f;hpb=001e5cf8131f65d83c2579fe7f59e3198c07e5ed;p=chaz%2Ftar diff --git a/src/list.c b/src/list.c index 61a3f85..e56e7dc 100644 --- a/src/list.c +++ b/src/list.c @@ -1,7 +1,7 @@ /* List a tar archive, with support routines for reading a tar archive. Copyright (C) 1988, 1992, 1993, 1994, 1996, 1997, 1998, 1999, 2000, - 2001, 2003, 2004 Free Software Foundation, Inc. + 2001, 2003, 2004, 2005 Free Software Foundation, Inc. Written by John Gilmore, on 1985-08-26. @@ -17,12 +17,12 @@ 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. */ /* Define to non-zero for forcing old ctime format instead of ISO format. */ #undef USE_OLD_CTIME -#include "system.h" +#include #include #include "common.h" @@ -37,7 +37,7 @@ 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 (const char *, size_t, const char *, - uintmax_t, uintmax_t); + uintmax_t, uintmax_t, bool, bool); /* Base 64 digits; see Internet RFC 2045 Table 1. */ static char const base_64_digits[64] = @@ -71,8 +71,8 @@ read_and (void (*do_something) (void)) base64_init (); name_gather (); - open_archive (ACCESS_READ); + open_archive (ACCESS_READ); do { prev_status = status; @@ -222,7 +222,7 @@ list_archive (void) set_next_block_after (current_header); if (multi_volume_option) { - assign_string (&save_name, current_stat_info.file_name); + assign_string (&save_name, current_stat_info.orig_file_name); save_totsize = current_stat_info.stat.st_size; } for (size = current_stat_info.stat.st_size; size > 0; size -= written) @@ -258,7 +258,7 @@ list_archive (void) } if (multi_volume_option) - assign_string (&save_name, current_stat_info.file_name); + assign_string (&save_name, current_stat_info.orig_file_name); skip_member (); @@ -266,6 +266,61 @@ list_archive (void) assign_string (&save_name, 0); } +/* Check header checksum */ +/* 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 + on the PDP-11, but it's signed on the Next and Sun. It looks like the + sources to BSD tar were never changed to compute the checksum + correctly, so both the Sun and Next add the bytes of the header as + signed chars. This doesn't cause a problem until you get a file with + a name containing characters with the high bit set. So tar_checksum + computes two checksums -- signed and unsigned. */ + +enum read_header +tar_checksum (union block *header, bool silent) +{ + size_t i; + int unsigned_sum = 0; /* the POSIX one :-) */ + int signed_sum = 0; /* the Sun one :-( */ + int recorded_sum; + uintmax_t parsed_sum; + char *p; + + p = header->buffer; + for (i = sizeof *header; i-- != 0;) + { + unsigned_sum += (unsigned char) *p; + signed_sum += (signed char) (*p++); + } + + if (unsigned_sum == 0) + return HEADER_ZERO_BLOCK; + + /* Adjust checksum to count the "chksum" field as blanks. */ + + for (i = sizeof header->header.chksum; i-- != 0;) + { + unsigned_sum -= (unsigned 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; + + parsed_sum = from_header (header->header.chksum, + sizeof header->header.chksum, 0, + (uintmax_t) 0, + (uintmax_t) TYPE_MAXIMUM (int), true, silent); + if (parsed_sum == (uintmax_t) -1) + return HEADER_FAILURE; + + recorded_sum = parsed_sum; + + if (unsigned_sum != recorded_sum && signed_sum != recorded_sum) + return HEADER_FAILURE; + + return HEADER_SUCCESS; +} + /* 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. @@ -279,24 +334,9 @@ list_archive (void) 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 - on the PDP-11, but it's signed on the Next and Sun. It looks like the - sources to BSD tar were never changed to compute the checksum - correctly, so both the Sun and Next add the bytes of the header as - signed chars. This doesn't cause a problem until you get a file with - a name containing characters with the high bit set. So read_header - computes two checksums -- signed and unsigned. */ - enum read_header read_header (bool raw_extended_headers) { - size_t i; - int unsigned_sum; /* the POSIX one :-) */ - int signed_sum; /* the Sun one :-( */ - int recorded_sum; - uintmax_t parsed_sum; - char *p; union block *header; union block *header_copy; char *bp; @@ -309,44 +349,15 @@ read_header (bool raw_extended_headers) while (1) { + enum read_header status; + header = find_next_block (); current_header = header; if (!header) return HEADER_END_OF_FILE; - unsigned_sum = 0; - signed_sum = 0; - p = header->buffer; - for (i = sizeof *header; i-- != 0;) - { - unsigned_sum += (unsigned char) *p; - signed_sum += (signed char) (*p++); - } - - if (unsigned_sum == 0) - return HEADER_ZERO_BLOCK; - - /* Adjust checksum to count the "chksum" field as blanks. */ - - for (i = sizeof header->header.chksum; i-- != 0;) - { - unsigned_sum -= (unsigned 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; - - parsed_sum = from_header (header->header.chksum, - sizeof header->header.chksum, 0, - (uintmax_t) 0, - (uintmax_t) TYPE_MAXIMUM (int)); - if (parsed_sum == (uintmax_t) -1) - return HEADER_FAILURE; - - recorded_sum = parsed_sum; - - if (unsigned_sum != recorded_sum && signed_sum != recorded_sum) - return HEADER_FAILURE; + if ((status = tar_checksum (header, false)) != HEADER_SUCCESS) + return status; /* Good block. Decode file size and return. */ @@ -358,7 +369,8 @@ read_header (bool raw_extended_headers) if (header->header.typeflag == GNUTYPE_LONGNAME || header->header.typeflag == GNUTYPE_LONGLINK || header->header.typeflag == XHDTYPE - || header->header.typeflag == XGLTYPE) + || header->header.typeflag == XGLTYPE + || header->header.typeflag == SOLARIS_XHDTYPE) { if (raw_extended_headers) return HEADER_SUCCESS_EXTENDED; @@ -366,7 +378,11 @@ read_header (bool raw_extended_headers) || header->header.typeflag == GNUTYPE_LONGLINK) { size_t name_size = current_stat_info.stat.st_size; - size = name_size - name_size % BLOCKSIZE + 2 * BLOCKSIZE; + size_t n = name_size % BLOCKSIZE; + size = name_size + BLOCKSIZE; + if (n) + size += BLOCKSIZE - n; + if (name_size != current_stat_info.stat.st_size || size < name_size) xalloc_die (); @@ -412,7 +428,8 @@ read_header (bool raw_extended_headers) *bp = '\0'; } - else if (header->header.typeflag == XHDTYPE) + else if (header->header.typeflag == XHDTYPE + || header->header.typeflag == SOLARIS_XHDTYPE) xheader_read (header, OFF_FROM_HEADER (header->header.size)); else if (header->header.typeflag == XGLTYPE) { @@ -450,11 +467,6 @@ read_header (bool raw_extended_headers) 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'; @@ -532,8 +544,10 @@ decode_header (union block *header, struct tar_stat_info *stat_info, 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); + assign_string (&stat_info->uname, + header->header.uname[0] ? header->header.uname : NULL); + assign_string (&stat_info->gname, + header->header.gname[0] ? header->header.gname : NULL); stat_info->devmajor = MAJOR_FROM_HEADER (header->header.devmajor); stat_info->devminor = MINOR_FROM_HEADER (header->header.devminor); @@ -602,13 +616,15 @@ decode_header (union block *header, struct tar_stat_info *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. */ + uintmax_t. DIGS must be positive. If TYPE is nonnull, the data + are of type TYPE. The buffer must represent a value in the range + -MINUS_MINVAL through MAXVAL. If OCTAL_ONLY, allow only octal + numbers instead of the other GNU extensions. Return -1 on error, + diagnosing the error if TYPE is nonnull and if !SILENT. */ static uintmax_t from_header (char const *where0, size_t digs, char const *type, - uintmax_t minus_minval, uintmax_t maxval) + uintmax_t minus_minval, uintmax_t maxval, + bool octal_only, bool silent) { uintmax_t value; char const *where = where0; @@ -624,8 +640,9 @@ from_header (char const *where0, size_t digs, char const *type, { if (where == lim) { - if (type) + if (type && !silent) ERROR ((0, 0, + /* TRANSLATORS: %s is type of the value (gid_t, uid_t, etc.) */ _("Blanks in header where numeric %s value expected"), type)); return -1; @@ -678,34 +695,43 @@ from_header (char const *where0, size_t digs, char const *type, if (!overflow && value <= minus_minval) { - WARN ((0, 0, - _("Archive octal value %.*s is out of %s range; assuming two's complement"), - (int) (where - where1), where1, type)); + if (!silent) + WARN ((0, 0, + /* TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) */ + _("Archive octal value %.*s is out of %s range; assuming two's complement"), + (int) (where - where1), where1, type)); negative = 1; } } if (overflow) { - if (type) + if (type && !silent) ERROR ((0, 0, + /* TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) */ _("Archive octal value %.*s is out of %s range"), (int) (where - where1), where1, type)); return -1; } } + else if (octal_only) + { + /* Suppress the following extensions. */ + } else 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) + if (!silent) { - warned_once = 1; - WARN ((0, 0, - _("Archive contains obsolescent base-64 headers"))); + static bool warned_once; + if (! warned_once) + { + warned_once = true; + WARN ((0, 0, _("Archive contains obsolescent base-64 headers"))); + } } negative = *where++ == '-'; while (where != lim @@ -716,7 +742,7 @@ from_header (char const *where0, size_t digs, char const *type, char *string = alloca (digs + 1); memcpy (string, where0, digs); string[digs] = '\0'; - if (type) + if (type && !silent) ERROR ((0, 0, _("Archive signed base-64 string %s is out of %s range"), quote (string), type)); @@ -747,7 +773,7 @@ from_header (char const *where0, size_t digs, char const *type, break; if (((value << LG_256 >> LG_256) | topbits) != value) { - if (type) + if (type && !silent) ERROR ((0, 0, _("Archive base-256 value is out of %s range"), type)); @@ -775,9 +801,11 @@ from_header (char const *where0, size_t digs, char const *type, while (where0 != lim && ! lim[-1]) lim--; quotearg_buffer (buf, sizeof buf, where0, lim - where, o); - ERROR ((0, 0, - _("Archive contains %.*s where numeric %s value expected"), - (int) sizeof buf, buf, type)); + if (!silent) + ERROR ((0, 0, + /* TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) */ + _("Archive contains %.*s where numeric %s value expected"), + (int) sizeof buf, buf, type)); } return -1; @@ -786,7 +814,7 @@ from_header (char const *where0, size_t digs, char const *type, if (value <= (negative ? minus_minval : maxval)) return negative ? -value : value; - if (type) + if (type && !silent) { char minval_buf[UINTMAX_STRSIZE_BOUND + 1]; char maxval_buf[UINTMAX_STRSIZE_BOUND]; @@ -797,7 +825,8 @@ 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"), + /* TRANSLATORS: Second %s is type name (gid_t,uid_t,etc.) */ + ERROR ((0, 0, _("Archive value %s is out of %s range %s..%s"), value_string, type, minval_string, STRINGIFY_BIGINT (maxval, maxval_buf))); } @@ -810,7 +839,8 @@ gid_from_header (const char *p, size_t s) { return from_header (p, s, "gid_t", - (uintmax_t) TYPE_MINIMUM (gid_t), - (uintmax_t) TYPE_MAXIMUM (gid_t)); + (uintmax_t) TYPE_MAXIMUM (gid_t), + false, false); } major_t @@ -818,7 +848,7 @@ major_from_header (const char *p, size_t s) { return from_header (p, s, "major_t", - (uintmax_t) TYPE_MINIMUM (major_t), - (uintmax_t) TYPE_MAXIMUM (major_t)); + (uintmax_t) TYPE_MAXIMUM (major_t), false, false); } minor_t @@ -826,7 +856,7 @@ minor_from_header (const char *p, size_t s) { return from_header (p, s, "minor_t", - (uintmax_t) TYPE_MINIMUM (minor_t), - (uintmax_t) TYPE_MAXIMUM (minor_t)); + (uintmax_t) TYPE_MAXIMUM (minor_t), false, false); } mode_t @@ -835,7 +865,7 @@ mode_from_header (const char *p, size_t s) /* Do not complain about unrecognized mode bits. */ unsigned u = from_header (p, s, "mode_t", - (uintmax_t) TYPE_MINIMUM (mode_t), - TYPE_MAXIMUM (uintmax_t)); + TYPE_MAXIMUM (uintmax_t), false, false); return ((u & TSUID ? S_ISUID : 0) | (u & TSGID ? S_ISGID : 0) | (u & TSVTX ? S_ISVTX : 0) @@ -856,14 +886,14 @@ off_from_header (const char *p, size_t s) /* Negative offsets are not allowed in tar files, so invoke from_header with minimum value 0, not TYPE_MINIMUM (off_t). */ return from_header (p, s, "off_t", (uintmax_t) 0, - (uintmax_t) TYPE_MAXIMUM (off_t)); + (uintmax_t) TYPE_MAXIMUM (off_t), false, false); } size_t size_from_header (const char *p, size_t s) { return from_header (p, s, "size_t", (uintmax_t) 0, - (uintmax_t) TYPE_MAXIMUM (size_t)); + (uintmax_t) TYPE_MAXIMUM (size_t), false, false); } time_t @@ -871,7 +901,7 @@ time_from_header (const char *p, size_t s) { return from_header (p, s, "time_t", - (uintmax_t) TYPE_MINIMUM (time_t), - (uintmax_t) TYPE_MAXIMUM (time_t)); + (uintmax_t) TYPE_MAXIMUM (time_t), false, false); } uid_t @@ -879,29 +909,17 @@ uid_from_header (const char *p, size_t s) { return from_header (p, s, "uid_t", - (uintmax_t) TYPE_MINIMUM (uid_t), - (uintmax_t) TYPE_MAXIMUM (uid_t)); + (uintmax_t) TYPE_MAXIMUM (uid_t), false, false); } uintmax_t uintmax_from_header (const char *p, size_t s) { return from_header (p, s, "uintmax_t", (uintmax_t) 0, - TYPE_MAXIMUM (uintmax_t)); + TYPE_MAXIMUM (uintmax_t), false, false); } -/* 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) -{ - *--buf = '\0'; - do - *--buf = '0' + (int) (o % 10); - while ((o /= 10) != 0); - return buf; -} - /* Return a printable representation of T. The result points to static storage that can be reused in the next call to this function, to ctime, or to asctime. */ @@ -1026,7 +1044,7 @@ print_header (struct tar_stat_info *st, off_t block_ordinal) case GNUTYPE_LONGNAME: case GNUTYPE_LONGLINK: modes[0] = 'L'; - ERROR ((0, 0, _("Visible longname error"))); + ERROR ((0, 0, _("Unexpected long name header"))); break; case GNUTYPE_SPARSE: @@ -1062,7 +1080,7 @@ print_header (struct tar_stat_info *st, off_t block_ordinal) break; } - decode_mode (st->stat.st_mode, modes + 1); + pax_decode_mode (st->stat.st_mode, modes + 1); /* Time stamp. */ @@ -1070,7 +1088,9 @@ print_header (struct tar_stat_info *st, off_t block_ordinal) /* User and group names. */ - if (st->uname && current_format != V7_FORMAT + if (st->uname + && st->uname[0] + && current_format != V7_FORMAT && !numeric_owner_option) user = st->uname; else @@ -1081,7 +1101,8 @@ print_header (struct tar_stat_info *st, off_t block_ordinal) uintmax_t u = from_header (current_header->header.uid, sizeof current_header->header.uid, 0, (uintmax_t) 0, - (uintmax_t) TYPE_MAXIMUM (uintmax_t)); + (uintmax_t) TYPE_MAXIMUM (uintmax_t), + false, false); if (u != -1) user = STRINGIFY_BIGINT (u, uform); else @@ -1092,7 +1113,9 @@ print_header (struct tar_stat_info *st, off_t block_ordinal) } } - if (st->gname && current_format != V7_FORMAT + if (st->gname + && st->gname[0] + && current_format != V7_FORMAT && !numeric_owner_option) group = st->gname; else @@ -1103,7 +1126,8 @@ print_header (struct tar_stat_info *st, off_t block_ordinal) uintmax_t g = from_header (current_header->header.gid, sizeof current_header->header.gid, 0, (uintmax_t) 0, - (uintmax_t) TYPE_MAXIMUM (uintmax_t)); + (uintmax_t) TYPE_MAXIMUM (uintmax_t), + false, false); if (g != -1) group = STRINGIFY_BIGINT (g, gform); else @@ -1215,7 +1239,7 @@ print_for_mkdir (char *dirname, int length, mode_t mode) /* File type and modes. */ modes[0] = 'd'; - decode_mode (mode, modes + 1); + pax_decode_mode (mode, modes + 1); if (block_number_option) { @@ -1253,7 +1277,7 @@ skip_file (off_t size) else seekable_archive = false; } - + while (size > 0) { x = find_next_block (); @@ -1274,8 +1298,8 @@ skip_member (void) { char save_typeflag = current_header->header.typeflag; set_next_block_after (current_header); - - assign_string (&save_name, current_stat_info.file_name); + + assign_string (&save_name, current_stat_info.orig_file_name); if (current_stat_info.is_sparse) sparse_skip_file (¤t_stat_info);