X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Flist.c;h=4ecd5b1cd1999da9f544708538a9c44909ab026b;hb=81a9e2ae36bd8c5f6accd83acb00826ad7222bb6;hp=7c7061a899722b88b5e3492f70b424e510a88850;hpb=8bfa7852eca1cbecab47bc4397f667b9eab3d561;p=chaz%2Ftar diff --git a/src/list.c b/src/list.c index 7c7061a..4ecd5b1 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,2001 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 @@ -29,9 +32,13 @@ 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] = @@ -58,7 +65,7 @@ base64_init (void) /* 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; @@ -70,7 +77,7 @@ read_and (void (*do_something) ()) while (1) { prev_status = status; - status = read_header (); + status = read_header (0); switch (status) { case HEADER_STILL_UNREAD: @@ -96,7 +103,7 @@ read_and (void (*do_something) ()) case GNUTYPE_MULTIVOL: case GNUTYPE_NAMES: break; - + case DIRTYPE: if (show_omitted_dirs_option) WARN ((0, 0, _("%s: Omitting"), @@ -173,7 +180,7 @@ list_archive (void) { if (verbose_option > 1) decode_header (current_header, ¤t_stat, ¤t_format, 0); - print_header (); + print_header (-1); } if (incremental_option && current_header->header.typeflag == GNUTYPE_DUMPDIR) @@ -236,6 +243,9 @@ list_archive (void) 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. */ @@ -249,7 +259,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 :-) */ @@ -258,11 +268,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) { @@ -315,19 +328,38 @@ read_header (void) if (header->header.typeflag == GNUTYPE_LONGNAME || header->header.typeflag == GNUTYPE_LONGLINK) { - longp = ((header->header.typeflag == GNUTYPE_LONGNAME) - ? &next_long_name - : &next_long_link); + if (raw_extended_headers) + return HEADER_SUCCESS_EXTENDED; + else + { + size_t name_size = current_stat.st_size; + size = name_size - name_size % BLOCKSIZE + 2 * BLOCKSIZE; + if (name_size != current_stat.st_size || size < name_size) + xalloc_die (); + } + + header_copy = xmalloc (size + 1); + + if (header->header.typeflag == GNUTYPE_LONGNAME) + { + if (next_long_name) + free (next_long_name); + next_long_name = header_copy; + next_long_name_blocks = size / BLOCKSIZE; + } + 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); - 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) + *header_copy = *header; + bp = header_copy->buffer + BLOCKSIZE; + + for (size -= BLOCKSIZE; size > 0; size -= written) { data_block = find_next_block (); if (! data_block) @@ -345,6 +377,8 @@ read_header (void) (data_block->buffer + written - 1)); } + *bp = '\0'; + /* Loop! */ } @@ -354,8 +388,16 @@ read_header (void) 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. */ @@ -376,27 +418,31 @@ read_header (void) 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 (&orig_file_name, name); assign_string (¤t_file_name, name); - if (next_long_name) + current_trailing_slash = strip_trailing_slashes (current_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; - } return HEADER_SUCCESS; } @@ -484,7 +530,8 @@ decode_header (union block *header, struct stat *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. */ + 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) @@ -534,7 +581,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. */ @@ -566,79 +613,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) - { - char *string = alloca (digs + 1); - memcpy (string, where0, digs); - string[digs] = '\0'; - 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++; + 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)) @@ -744,7 +788,7 @@ 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)); } @@ -810,8 +854,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; } @@ -856,10 +900,12 @@ static int ugswidth = UGSWIDTH; /* maximum width encountered so far */ #endif void -print_header (void) +print_header (off_t block_ordinal) { char modes[11]; char const *time_stamp; + char *temp_name = orig_file_name ? orig_file_name : current_file_name; + /* These hold formatted ints. */ char uform[UINTMAX_STRSIZE_BOUND], gform[UINTMAX_STRSIZE_BOUND]; char *user, *group; @@ -871,14 +917,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 { @@ -901,17 +951,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; @@ -947,17 +1000,45 @@ print_header (void) && !numeric_owner_option) user = current_header->header.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 && !numeric_owner_option) group = current_header->header.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. */ @@ -992,7 +1073,7 @@ 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) { @@ -1026,6 +1107,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;