X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Flist.c;h=4bf302e6d629fbc57726ea9ac071483c009ad3a5;hb=137ebf41fd97baa7e4f2a66e0da0bdb182ca6f7b;hp=ddf044df0e1f1621b8669aceacbf42df43b2c297;hpb=d659cbaccdc1f3279c49107cf15f15a639738529;p=chaz%2Ftar diff --git a/src/list.c b/src/list.c index ddf044d..4bf302e 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, 2005 Free Software Foundation, Inc. + 2001, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. Written by John Gilmore, on 1985-08-26. @@ -99,15 +99,14 @@ read_and (void (*do_something) (void)) /* FIXME: Grab fractional time stamps from extended header. */ mtime.tv_nsec = 0, - set_stat_mtime (¤t_stat_info.stat, mtime), - OLDER_STAT_TIME (current_stat_info.stat, m))) + current_stat_info.mtime = mtime, + OLDER_TAR_STAT_TIME (current_stat_info, m))) || excluded_name (current_stat_info.file_name)) { switch (current_header->header.typeflag) { case GNUTYPE_VOLHDR: case GNUTYPE_MULTIVOL: - case GNUTYPE_NAMES: break; case DIRTYPE: @@ -205,63 +204,24 @@ read_and (void (*do_something) (void)) void list_archive (void) { + off_t block_ordinal = current_block_ordinal (); /* Print the header block. */ decode_header (current_header, ¤t_stat_info, ¤t_format, 0); if (verbose_option) - print_header (¤t_stat_info, -1); + print_header (¤t_stat_info, block_ordinal); - if (incremental_option && current_header->header.typeflag == GNUTYPE_DUMPDIR) + if (incremental_option) { - off_t size; - size_t written, check; - union block *data_block; - - set_next_block_after (current_header); - if (multi_volume_option) + if (verbose_option > 2) { - assign_string (&save_name, current_stat_info.orig_file_name); - save_totsize = current_stat_info.stat.st_size; + if (is_dumpdir (¤t_stat_info)) + list_dumpdir (current_stat_info.dumpdir, + dumpdir_size (current_stat_info.dumpdir)); } - for (size = current_stat_info.stat.st_size; size > 0; size -= written) - { - if (multi_volume_option) - save_sizeleft = size; - data_block = find_next_block (); - if (!data_block) - { - ERROR ((0, 0, _("Unexpected EOF in archive"))); - break; /* FIXME: What happens, then? */ - } - written = available_space_after (data_block); - if (written > size) - written = size; - errno = 0; - check = fwrite (data_block->buffer, sizeof (char), written, stdlis); - set_next_block_after ((union block *) - (data_block->buffer + written - 1)); - if (check != written) - { - write_error_details (current_stat_info.file_name, check, written); - skip_file (size - written); - break; - } - } - if (multi_volume_option) - assign_string (&save_name, 0); - fputc ('\n', stdlis); - fflush (stdlis); - return; - } - if (multi_volume_option) - assign_string (&save_name, current_stat_info.orig_file_name); - skip_member (); - - if (multi_volume_option) - assign_string (&save_name, 0); } /* Check header checksum */ @@ -320,8 +280,8 @@ tar_checksum (union block *header, bool silent) } /* 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. + address in "current_header", and if it is good, the file's size + and names (file name, link name) in *info. Return 1 for success, 0 if the checksum is bad, EOF on eof, 2 for a block full of zeros (EOF marker). @@ -333,7 +293,7 @@ tar_checksum (union block *header, bool silent) the header which this routine reads. */ enum read_header -read_header (bool raw_extended_headers) +read_header_primitive (bool raw_extended_headers, struct tar_stat_info *info) { union block *header; union block *header_copy; @@ -360,9 +320,9 @@ read_header (bool raw_extended_headers) /* Good block. Decode file size and return. */ if (header->header.typeflag == LNKTYPE) - current_stat_info.stat.st_size = 0; /* links 0 size on tape */ + info->stat.st_size = 0; /* links 0 size on tape */ else - current_stat_info.stat.st_size = OFF_FROM_HEADER (header->header.size); + info->stat.st_size = OFF_FROM_HEADER (header->header.size); if (header->header.typeflag == GNUTYPE_LONGNAME || header->header.typeflag == GNUTYPE_LONGLINK @@ -375,14 +335,13 @@ read_header (bool raw_extended_headers) else if (header->header.typeflag == GNUTYPE_LONGNAME || header->header.typeflag == GNUTYPE_LONGLINK) { - size_t name_size = current_stat_info.stat.st_size; + size_t name_size = info->stat.st_size; 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) + if (name_size != info->stat.st_size || size < name_size) xalloc_die (); header_copy = xmalloc (size + 1); @@ -433,6 +392,7 @@ read_header (bool raw_extended_headers) { xheader_read (header, OFF_FROM_HEADER (header->header.size)); xheader_decode_global (); + xheader_destroy (&extended_header); } /* Loop! */ @@ -472,9 +432,9 @@ read_header (bool raw_extended_headers) recent_long_name = 0; recent_long_name_blocks = 0; } - 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); + assign_string (&info->orig_file_name, name); + assign_string (&info->file_name, name); + info->had_trailing_slash = strip_trailing_slashes (info->file_name); if (recent_long_link) free (recent_long_link); @@ -493,13 +453,34 @@ read_header (bool raw_extended_headers) recent_long_link = 0; recent_long_link_blocks = 0; } - assign_string (¤t_stat_info.link_name, name); + assign_string (&info->link_name, name); return HEADER_SUCCESS; } } } +enum read_header +read_header (bool raw_extended_headers) +{ + return read_header_primitive (raw_extended_headers, ¤t_stat_info); +} + +static char * +decode_xform (char *file_name) +{ + file_name = safer_name_suffix (file_name, false, absolute_names_option); + if (strip_name_components) + { + size_t prefix_len = stripped_prefix_len (file_name, + strip_name_components); + if (prefix_len == (size_t) -1) + prefix_len = strlen (file_name); + file_name += prefix_len; + } + return file_name; +} + #define ISOCTAL(c) ((c)>='0'&&(c)<='7') /* Decode things from a file HEADER block into STAT_INFO, also setting @@ -520,9 +501,6 @@ decode_header (union block *header, struct tar_stat_info *stat_info, enum archive_format *format_pointer, int do_user_group) { enum archive_format format; - struct timespec atime; - struct timespec ctime; - struct timespec mtime; if (strcmp (header->header.magic, TMAGIC) == 0) { @@ -544,9 +522,8 @@ decode_header (union block *header, struct tar_stat_info *stat_info, *format_pointer = format; stat_info->stat.st_mode = MODE_FROM_HEADER (header->header.mode); - mtime.tv_sec = TIME_FROM_HEADER (header->header.mtime); - mtime.tv_nsec = 0; - set_stat_mtime (&stat_info->stat, mtime); + stat_info->mtime.tv_sec = TIME_FROM_HEADER (header->header.mtime); + stat_info->mtime.tv_nsec = 0; assign_string (&stat_info->uname, header->header.uname[0] ? header->header.uname : NULL); assign_string (&stat_info->gname, @@ -554,21 +531,18 @@ decode_header (union block *header, struct tar_stat_info *stat_info, if (format == OLDGNU_FORMAT && incremental_option) { - atime.tv_sec = TIME_FROM_HEADER (header->oldgnu_header.atime); - ctime.tv_sec = TIME_FROM_HEADER (header->oldgnu_header.ctime); - atime.tv_nsec = ctime.tv_nsec = 0; + stat_info->atime.tv_sec = TIME_FROM_HEADER (header->oldgnu_header.atime); + stat_info->ctime.tv_sec = TIME_FROM_HEADER (header->oldgnu_header.ctime); + stat_info->atime.tv_nsec = stat_info->ctime.tv_nsec = 0; } else if (format == STAR_FORMAT) { - atime.tv_sec = TIME_FROM_HEADER (header->star_header.atime); - ctime.tv_sec = TIME_FROM_HEADER (header->star_header.ctime); - atime.tv_nsec = ctime.tv_nsec = 0; + stat_info->atime.tv_sec = TIME_FROM_HEADER (header->star_header.atime); + stat_info->ctime.tv_sec = TIME_FROM_HEADER (header->star_header.ctime); + stat_info->atime.tv_nsec = stat_info->ctime.tv_nsec = 0; } else - atime = ctime = start_time; - - set_stat_atime (&stat_info->stat, atime); - set_stat_ctime (&stat_info->stat, ctime); + stat_info->atime = stat_info->ctime = start_time; if (format == V7_FORMAT) { @@ -616,7 +590,16 @@ decode_header (union block *header, struct tar_stat_info *stat_info, stat_info->is_sparse = true; } else - stat_info->is_sparse = false; + { + stat_info->is_sparse = false; + if (((current_format == GNU_FORMAT + || current_format == OLDGNU_FORMAT) + && current_header->header.typeflag == GNUTYPE_DUMPDIR) + || stat_info->dumpdir) + stat_info->is_dumpdir = true; + } + + transform_name_fp (&stat_info->file_name, decode_xform); } /* Convert buffer at WHERE0 of size DIGS from external format to @@ -1013,7 +996,7 @@ print_header (struct tar_stat_info *st, off_t block_ordinal) char modes[11]; char const *time_stamp; int time_stamp_len; - char *temp_name = st->orig_file_name ? st->orig_file_name : st->file_name; + char *temp_name; /* These hold formatted ints. */ char uform[UINTMAX_STRSIZE_BOUND], gform[UINTMAX_STRSIZE_BOUND]; @@ -1024,6 +1007,14 @@ print_header (struct tar_stat_info *st, off_t block_ordinal) int pad; int sizelen; + if (test_label_option && current_header->header.typeflag != GNUTYPE_VOLHDR) + return; + + if (show_transformed_names_option) + temp_name = st->file_name ? st->file_name : st->orig_file_name; + else + temp_name = st->orig_file_name ? st->orig_file_name : st->file_name; + if (block_number_option) { char buf[UINTMAX_STRSIZE_BOUND]; @@ -1055,10 +1046,6 @@ print_header (struct tar_stat_info *st, off_t block_ordinal) modes[0] = 'M'; break; - case GNUTYPE_NAMES: - modes[0] = 'N'; - break; - case GNUTYPE_LONGNAME: case GNUTYPE_LONGLINK: modes[0] = 'L'; @@ -1102,7 +1089,7 @@ print_header (struct tar_stat_info *st, off_t block_ordinal) /* Time stamp. */ - time_stamp = tartime (get_stat_mtime (&st->stat), false); + time_stamp = tartime (st->mtime, false); time_stamp_len = strlen (time_stamp); if (datewidth < time_stamp_len) datewidth = time_stamp_len; @@ -1242,10 +1229,6 @@ print_header (struct tar_stat_info *st, off_t block_ordinal) uintbuf)); fprintf (stdlis, _("--Continued at byte %s--\n"), size); break; - - case GNUTYPE_NAMES: - fprintf (stdlis, _("--Mangled file names--\n")); - break; } } fflush (stdlis); @@ -1282,25 +1265,19 @@ skip_file (off_t size) { union block *x; - if (multi_volume_option) - { - save_totsize = size; - save_sizeleft = size; - } + /* FIXME: Make sure mv_begin is always called before it */ if (seekable_archive) { off_t nblk = seek_archive (size); if (nblk >= 0) - { - size -= nblk * BLOCKSIZE; - if (multi_volume_option) /* Argh.. */ - save_sizeleft -= nblk * BLOCKSIZE; - } + size -= nblk * BLOCKSIZE; else seekable_archive = false; } + mv_size_left (size); + while (size > 0) { x = find_next_block (); @@ -1309,8 +1286,7 @@ skip_file (off_t size) set_next_block_after (x); size -= BLOCKSIZE; - if (multi_volume_option) - save_sizeleft -= BLOCKSIZE; + mv_size_left (size); } } @@ -1319,13 +1295,18 @@ skip_file (off_t size) void skip_member (void) { - char save_typeflag = current_header->header.typeflag; - set_next_block_after (current_header); + if (!current_stat_info.skipped) + { + char save_typeflag = current_header->header.typeflag; + set_next_block_after (current_header); - assign_string (&save_name, current_stat_info.orig_file_name); + mv_begin (¤t_stat_info); - if (current_stat_info.is_sparse) - sparse_skip_file (¤t_stat_info); - else if (save_typeflag != DIRTYPE) - skip_file (current_stat_info.stat.st_size); + if (current_stat_info.is_sparse) + sparse_skip_file (¤t_stat_info); + else if (save_typeflag != DIRTYPE) + skip_file (current_stat_info.stat.st_size); + + mv_end (); + } }