X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Flist.c;h=0657fcff036492fd4f9367de5303e9e2b0dccc12;hb=263604c2ec4703cc7381899b3ad015b79f6d0d41;hp=a62c706261a58ca142f19e9fb532c802b4328a6b;hpb=368172bf255c539fdbf2fd74328514c7e0acde8f;p=chaz%2Ftar diff --git a/src/list.c b/src/list.c index a62c706..0657fcf 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. @@ -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, bool); + uintmax_t, uintmax_t, bool, bool); /* Base 64 digits; see Internet RFC 2045 Table 1. */ static char const base_64_digits[64] = @@ -285,7 +285,7 @@ tar_checksum (union block *header, bool silent) int recorded_sum; uintmax_t parsed_sum; char *p; - + p = header->buffer; for (i = sizeof *header; i-- != 0;) { @@ -309,12 +309,12 @@ tar_checksum (union block *header, bool silent) parsed_sum = from_header (header->header.chksum, sizeof header->header.chksum, 0, (uintmax_t) 0, - (uintmax_t) TYPE_MAXIMUM (int), silent); + (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; @@ -337,7 +337,6 @@ tar_checksum (union block *header, bool silent) enum read_header read_header (bool raw_extended_headers) { - char *p; union block *header; union block *header_copy; char *bp; @@ -351,7 +350,7 @@ read_header (bool raw_extended_headers) while (1) { enum read_header status; - + header = find_next_block (); current_header = header; if (!header) @@ -378,7 +377,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 (); @@ -462,11 +465,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'; @@ -616,14 +614,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. SILENT=true inhibits printing diagnostic messages. - 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, bool silent) + uintmax_t minus_minval, uintmax_t maxval, + bool octal_only, bool silent) { uintmax_t value; char const *where = where0; @@ -641,6 +640,7 @@ from_header (char const *where0, size_t digs, char const *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; @@ -695,6 +695,7 @@ from_header (char const *where0, size_t digs, char const *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; @@ -705,24 +706,30 @@ from_header (char const *where0, size_t digs, char const *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; - if (!silent) - 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 @@ -794,6 +801,7 @@ from_header (char const *where0, size_t digs, char const *type, quotearg_buffer (buf, sizeof buf, where0, lim - where, o); 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)); } @@ -815,7 +823,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))); } @@ -829,7 +838,7 @@ 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), - false); + false, false); } major_t @@ -837,7 +846,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), false); + (uintmax_t) TYPE_MAXIMUM (major_t), false, false); } minor_t @@ -845,7 +854,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), false); + (uintmax_t) TYPE_MAXIMUM (minor_t), false, false); } mode_t @@ -854,7 +863,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), false); + TYPE_MAXIMUM (uintmax_t), false, false); return ((u & TSUID ? S_ISUID : 0) | (u & TSGID ? S_ISGID : 0) | (u & TSVTX ? S_ISVTX : 0) @@ -875,14 +884,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), false); + (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), false); + (uintmax_t) TYPE_MAXIMUM (size_t), false, false); } time_t @@ -890,7 +899,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), false); + (uintmax_t) TYPE_MAXIMUM (time_t), false, false); } uid_t @@ -898,14 +907,14 @@ 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), false); + (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), false); + TYPE_MAXIMUM (uintmax_t), false, false); } @@ -1045,7 +1054,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: @@ -1089,7 +1098,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 @@ -1101,7 +1112,7 @@ print_header (struct tar_stat_info *st, off_t block_ordinal) sizeof current_header->header.uid, 0, (uintmax_t) 0, (uintmax_t) TYPE_MAXIMUM (uintmax_t), - false); + false, false); if (u != -1) user = STRINGIFY_BIGINT (u, uform); else @@ -1112,7 +1123,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 @@ -1124,7 +1137,7 @@ print_header (struct tar_stat_info *st, off_t block_ordinal) sizeof current_header->header.gid, 0, (uintmax_t) 0, (uintmax_t) TYPE_MAXIMUM (uintmax_t), - false); + false, false); if (g != -1) group = STRINGIFY_BIGINT (g, gform); else @@ -1274,7 +1287,7 @@ skip_file (off_t size) else seekable_archive = false; } - + while (size > 0) { x = find_next_block (); @@ -1295,7 +1308,7 @@ 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); if (current_stat_info.is_sparse)