X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Flist.c;h=fdc8fa9975b14cb7b81e4d0e72fa9323f4076d18;hb=d46025b23c5bbe31902ba4e902312ce8fe05ed63;hp=8169a7968704294d4aafeefeb746cfcd244b1f1e;hpb=85f651c8c69c45c2df5ea6d9bd8efb3b6c28584f;p=chaz%2Ftar diff --git a/src/list.c b/src/list.c index 8169a79..fdc8fa9 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 1988, 1992, 1993, 1994, 1996, 1997, 1998, 1999, 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. @@ -30,15 +30,14 @@ #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] = @@ -65,7 +64,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; @@ -74,13 +73,17 @@ read_and (void (*do_something) ()) name_gather (); open_archive (ACCESS_READ); - while (1) + do { prev_status = status; - status = read_header (0); + 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: @@ -88,14 +91,14 @@ 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)) { switch (current_header->header.typeflag) { @@ -103,17 +106,17 @@ read_and (void (*do_something) ()) 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_member (); continue; } - } + } (*do_something) (); continue; @@ -127,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) @@ -160,11 +172,15 @@ 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)); close_archive (); names_notfound (); /* print names not found */ @@ -176,12 +192,9 @@ 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) { @@ -192,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; @@ -214,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; } @@ -228,7 +241,7 @@ list_archive (void) } if (multi_volume_option) - assign_string (&save_name, current_file_name); + assign_string (&save_name, current_stat_info.file_name); skip_member (); @@ -238,7 +251,7 @@ list_archive (void) /* 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. + 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). @@ -268,14 +281,14 @@ read_header (bool raw_extended_headers) uintmax_t parsed_sum; char *p; union block *header; - union block **longp; + union block *header_copy; char *bp; union block *data_block; size_t size, written; - static union block *next_long_name; - static union block *next_long_link; - static size_t next_long_name_blocks; - static size_t next_long_link_blocks; + 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) { @@ -321,61 +334,71 @@ read_header (bool raw_extended_headers) /* 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) { if (raw_extended_headers) return HEADER_SUCCESS_EXTENDED; - else + else if (header->header.typeflag == GNUTYPE_LONGNAME + || header->header.typeflag == GNUTYPE_LONGLINK) { - size_t name_size = current_stat.st_size; + size_t name_size = current_stat_info.stat.st_size; size = name_size - name_size % BLOCKSIZE + 2 * BLOCKSIZE; - if (name_size != current_stat.st_size || size < name_size) + if (name_size != current_stat_info.stat.st_size + || size < name_size) xalloc_die (); - } - - if (header->header.typeflag == GNUTYPE_LONGNAME) - { - longp = &next_long_name; - next_long_name_blocks = size / BLOCKSIZE; - } - else - { - longp = &next_long_link; - next_long_link_blocks = size / BLOCKSIZE; - } - set_next_block_after (header); - if (*longp) - free (*longp); - *longp = xmalloc (size); - **longp = *header; - bp = (*longp)->buffer + BLOCKSIZE; - - for (size -= BLOCKSIZE; size > 0; size -= written) - { - data_block = find_next_block (); - if (! data_block) + 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; - *bp = '\0'; + 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! */ } @@ -385,6 +408,9 @@ read_header (bool raw_extended_headers) struct posix_header const *h = ¤t_header->header; char namebuf[sizeof h->prefix + 1 + NAME_FIELD_SIZE + 1]; + if (recent_long_name) + free (recent_long_name); + if (next_long_name) { name = next_long_name->buffer + BLOCKSIZE; @@ -412,10 +438,16 @@ read_header (bool raw_extended_headers) 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); - + 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) { name = next_long_link->buffer + BLOCKSIZE; @@ -427,15 +459,18 @@ read_header (bool raw_extended_headers) 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); + assign_string (¤t_stat_info.link_name, name); return HEADER_SUCCESS; } } } +#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 @@ -450,68 +485,90 @@ read_header (bool raw_extended_headers) 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; } } + + current_stat_info.archive_file_size = current_stat_info.stat.st_size; + xheader_decode (stat_info); } /* Convert buffer at WHERE0 of size DIGS from external format to @@ -710,7 +767,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))); } @@ -775,7 +832,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)); } @@ -841,8 +898,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; } @@ -872,7 +929,7 @@ tartime (time_t t) /* 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. */ @@ -887,10 +944,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; @@ -902,14 +961,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 { @@ -932,17 +995,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; @@ -966,17 +1032,17 @@ 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 { /* Try parsing it as an unsigned integer first, and as a @@ -996,9 +1062,9 @@ print_header (void) } } - 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 { /* Try parsing it as an unsigned integer first, and as a @@ -1025,10 +1091,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, @@ -1038,7 +1104,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; } @@ -1051,16 +1118,16 @@ 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: @@ -1085,6 +1152,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; @@ -1162,7 +1237,8 @@ skip_member (void) char save_typeflag = current_header->header.typeflag; set_next_block_after (current_header); - if (current_header->oldgnu_header.isextended) + if (current_format == OLDGNU_FORMAT + && current_header->oldgnu_header.isextended) { union block *exhdr; do @@ -1176,5 +1252,5 @@ skip_member (void) } if (save_typeflag != DIRTYPE) - skip_file (current_stat.st_size); + skip_file (current_stat_info.stat.st_size); }