/* List a tar archive, with support routines for reading a tar archive.
- Copyright (C) 1988, 92, 93, 94, 96, 97 Free Software Foundation, Inc.
+ Copyright 1988, 92,93,94,96,97,98,99, 2000 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
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 Place - Suite 330, Boston, MA 02111-1307, USA. */
+ 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
-/* Define to non-zero for forcing old ctime() instead of isotime(). */
+/* Define to non-zero for forcing old ctime format instead of ISO format. */
#undef USE_OLD_CTIME
#include "system.h"
+#include <quotearg.h>
-#include <ctype.h>
#include <time.h>
-
-#define ISODIGIT(Char) \
- ((unsigned char) (Char) >= '0' && (unsigned char) (Char) <= '7')
-#define ISSPACE(Char) (ISASCII (Char) && isspace (Char))
+#ifndef time
+time_t time ();
+#endif
#include "common.h"
+#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 */
+static uintmax_t from_header PARAMS ((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] =
+{
+ 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M',
+ 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z',
+ 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm',
+ 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z',
+ '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', '+', '/'
+};
+
+/* Table of base-64 digit values indexed by unsigned chars.
+ The value is 64 for unsigned chars that are not base-64 digits. */
+static char base64_map[UCHAR_MAX + 1];
+
+static void
+base64_init (void)
+{
+ int i;
+ memset (base64_map, 64, sizeof base64_map);
+ for (i = 0; i < 64; i++)
+ base64_map[(int) base_64_digits[i]] = i;
+}
+
/*-----------------------------------.
| Main loop for reading an archive. |
`-----------------------------------*/
{
enum read_header status = HEADER_STILL_UNREAD;
enum read_header prev_status;
- char save_typeflag;
+ base64_init ();
name_gather ();
open_archive (ACCESS_READ);
/* Valid header. We should decode next field (mode) first.
Ensure incoming names are null terminated. */
- /* FIXME: This is a quick kludge before 1.12 goes out. */
- current_stat.st_mtime
- = from_oct (1 + 12, current_header->header.mtime);
-
- if (!name_match (current_file_name)
- || current_stat.st_mtime < newer_mtime_option
- || (exclude_option && check_exclude (current_file_name)))
+ if (! name_match (current_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
+ = TIME_FROM_HEADER (current_header->header.mtime))
+ < newer_mtime_option))
+ || excluded_name (current_file_name))
{
- int isextended = 0;
-
- if (current_header->header.typeflag == GNUTYPE_VOLHDR
- || current_header->header.typeflag == GNUTYPE_MULTIVOL
- || current_header->header.typeflag == GNUTYPE_NAMES)
+ char save_typeflag = current_header->header.typeflag;
+ switch (save_typeflag)
{
- (*do_something) ();
- continue;
- }
- if (show_omitted_dirs_option
- && current_header->header.typeflag == DIRTYPE)
- WARN ((0, 0, _("Omitting %s"), current_file_name));
+ case GNUTYPE_VOLHDR:
+ case GNUTYPE_MULTIVOL:
+ case GNUTYPE_NAMES:
+ break;
+
+ case DIRTYPE:
+ if (show_omitted_dirs_option)
+ WARN ((0, 0, _("%s: Omitting"),
+ quotearg_colon (current_file_name)));
+ /* Fall through. */
+ default:
- /* Skip past it in the archive. */
+ /* Skip past it in the archive. */
- if (current_header->oldgnu_header.isextended)
- isextended = 1;
- save_typeflag = current_header->header.typeflag;
- set_next_block_after (current_header);
- if (isextended)
- {
-#if 0
- union block *exhdr;
-
- while (1)
- {
- exhdr = find_next_block ();
- if (!exhdr->sparse_header.isextended)
- {
- set_next_block_after (exhdr);
- break;
- }
- }
- set_next_block_after (exhdr);
-#endif
- skip_extended_headers ();
- }
+ set_next_block_after (current_header);
+ if (current_header->oldgnu_header.isextended)
+ skip_extended_headers ();
- /* Skip to the next header on the archive. */
+ /* Skip to the next header on the archive. */
- if (save_typeflag != DIRTYPE)
- skip_file ((long) current_stat.st_size);
- continue;
- }
+ if (save_typeflag != DIRTYPE)
+ skip_file (current_stat.st_size);
+ continue;
+ }
+ }
+ apply_nonancestor_delayed_set_stat (current_file_name);
(*do_something) ();
continue;
case HEADER_ZERO_BLOCK:
if (block_number_option)
- fprintf (stdlis, _("block %10ld: ** Block of NULs **\n"),
- current_block_ordinal ());
+ {
+ char buf[UINTMAX_STRSIZE_BOUND];
+ fprintf (stdlis, _("block %s: ** Block of NULs **\n"),
+ STRINGIFY_BIGINT (current_block_ordinal (), buf));
+ }
set_next_block_after (current_header);
status = prev_status;
case HEADER_END_OF_FILE:
if (block_number_option)
- fprintf (stdlis, _("block %10ld: ** End of File **\n"),
- current_block_ordinal ());
+ {
+ char buf[UINTMAX_STRSIZE_BOUND];
+ fprintf (stdlis, _("block %s: ** End of File **\n"),
+ STRINGIFY_BIGINT (current_block_ordinal (), buf));
+ }
break;
case HEADER_FAILURE:
switch (prev_status)
{
case HEADER_STILL_UNREAD:
- WARN ((0, 0, _("Hmm, this doesn't look like a tar archive")));
+ ERROR ((0, 0, _("This does not look like a tar archive")));
/* Fall through. */
case HEADER_ZERO_BLOCK:
case HEADER_SUCCESS:
- WARN ((0, 0, _("Skipping to next file header")));
+ ERROR ((0, 0, _("Skipping to next header")));
break;
case HEADER_END_OF_FILE:
void
list_archive (void)
{
- int isextended = 0; /* to remember if current_header is extended */
-
/* Print the header block. */
if (verbose_option)
if (incremental_option && current_header->header.typeflag == GNUTYPE_DUMPDIR)
{
- size_t size, written, check;
+ off_t size;
+ size_t written, check;
union block *data_block;
set_next_block_after (current_header);
data_block = find_next_block ();
if (!data_block)
{
- ERROR ((0, 0, _("EOF in archive file")));
+ 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; /* FIXME: errno should be read-only */
+ 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)
{
- ERROR ((0, errno, _("Only wrote %ld of %ld bytes to file %s"),
- check, written, current_file_name));
- skip_file ((long) (size - written));
+ write_error_details (current_file_name, check, written);
+ skip_file (size - written);
break;
}
}
if (multi_volume_option)
- assign_string (&save_name, NULL);
+ assign_string (&save_name, 0);
fputc ('\n', stdlis);
fflush (stdlis);
return;
}
- /* Check to see if we have an extended header to skip over also. */
-
- if (current_header->oldgnu_header.isextended)
- isextended = 1;
-
- /* Skip past the header in the archive. */
+ /* Skip past the header in the archive, and past any extended headers. */
set_next_block_after (current_header);
-
- /* If we needed to skip any extended headers, do so now, by reading
- extended headers and skipping past them in the archive. */
-
- if (isextended)
- {
-#if 0
- union block *exhdr;
-
- while (1)
- {
- exhdr = find_next_block ();
-
- if (!exhdr->sparse_header.isextended)
- {
- set_next_block_after (exhdr);
- break;
- }
- set_next_block_after (exhdr);
- }
-#endif
- skip_extended_headers ();
- }
+ if (current_header->oldgnu_header.isextended)
+ skip_extended_headers ();
if (multi_volume_option)
assign_string (&save_name, current_file_name);
/* Skip to the next header on the archive. */
- skip_file ((long) current_stat.st_size);
+ skip_file (current_stat.st_size);
if (multi_volume_option)
- assign_string (&save_name, NULL);
+ assign_string (&save_name, 0);
}
/*-----------------------------------------------------------------------.
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
- currectly, so both the Sun and Next add the bytes of the header as
+ 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. */
-/* FIXME: The signed checksum computation is broken on machines where char's
- are unsigned. It's uneasy to handle all cases correctly... */
-
enum read_header
read_header (void)
{
- int i;
- long unsigned_sum; /* the POSIX one :-) */
- long signed_sum; /* the Sun one :-( */
- long recorded_sum;
+ 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;
char **longp;
char *bp;
union block *data_block;
- int size, written;
+ size_t size, written;
static char *next_long_name, *next_long_link;
while (1)
if (!header)
return HEADER_END_OF_FILE;
- recorded_sum
- = from_oct (sizeof header->header.chksum, header->header.chksum);
-
unsigned_sum = 0;
signed_sum = 0;
p = header->buffer;
- for (i = sizeof (*header); --i >= 0;)
+ for (i = sizeof *header; i-- != 0;)
{
- /* We can't use unsigned char here because of old compilers,
- e.g. V7. */
-
- unsigned_sum += 0xFF & *p;
- signed_sum += *p++;
+ 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;)
+ for (i = sizeof header->header.chksum; i-- != 0;)
{
- unsigned_sum -= 0xFF & header->header.chksum[i];
- signed_sum -= header->header.chksum[i];
+ 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;
- if (unsigned_sum == sizeof header->header.chksum * ' ')
- {
- /* This is a zeroed block...whole block is 0's except for the
- blanks we faked for the checksum field. */
+ 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;
- return HEADER_ZERO_BLOCK;
- }
+ recorded_sum = parsed_sum;
if (unsigned_sum != recorded_sum && signed_sum != recorded_sum)
return HEADER_FAILURE;
if (header->header.typeflag == LNKTYPE)
current_stat.st_size = 0; /* links 0 size on tape */
else
- current_stat.st_size = from_oct (1 + 12, header->header.size);
+ current_stat.st_size = OFF_FROM_HEADER (header->header.size);
- header->header.name[NAME_FIELD_SIZE - 1] = '\0';
if (header->header.typeflag == GNUTYPE_LONGNAME
|| header->header.typeflag == GNUTYPE_LONGLINK)
{
set_next_block_after (header);
if (*longp)
free (*longp);
- bp = *longp = (char *) xmalloc ((size_t) current_stat.st_size);
+ size = current_stat.st_size;
+ if (size != current_stat.st_size)
+ xalloc_die ();
+ bp = *longp = xmalloc (size);
- for (size = current_stat.st_size; size > 0; size -= written)
+ for (; size > 0; size -= written)
{
data_block = find_next_block ();
- if (data_block == NULL)
+ if (! data_block)
{
- ERROR ((0, 0, _("Unexpected EOF on archive file")));
+ ERROR ((0, 0, _("Unexpected EOF in archive")));
break;
}
written = available_space_after (data_block);
if (written > size)
written = size;
- memcpy (bp, data_block->buffer, (size_t) written);
+ memcpy (bp, data_block->buffer, written);
bp += written;
set_next_block_after ((union block *)
(data_block->buffer + written - 1));
}
else
{
- assign_string (¤t_file_name,
- (next_long_name ? next_long_name
- : current_header->header.name));
- assign_string (¤t_link_name,
- (next_long_link ? next_long_link
- : current_header->header.linkname));
- next_long_link = next_long_name = 0;
+ char *name;
+ struct posix_header *h = ¤t_header->header;
+ char namebuf[sizeof h->prefix + 1 + NAME_FIELD_SIZE + 1];
+
+ name = next_long_name;
+ if (! name)
+ {
+ /* Accept file names as specified by POSIX.1-1996
+ section 10.1.1. */
+ int posix_header = strcmp (h->magic, TMAGIC) == 0;
+ char *np = namebuf;
+
+ if (posix_header && h->prefix[0])
+ {
+ memcpy (np, h->prefix, sizeof h->prefix);
+ np[sizeof h->prefix] = '\0';
+ np += strlen (np);
+ *np++ = '/';
+ }
+ memcpy (np, h->name, sizeof h->name);
+ np[sizeof h->name] = '\0';
+ name = namebuf;
+ }
+ assign_string (¤t_file_name, name);
+ if (next_long_name)
+ {
+ free (next_long_name);
+ next_long_name = 0;
+ }
+
+ name = next_long_link;
+ if (! name)
+ {
+ memcpy (namebuf, h->linkname, sizeof h->linkname);
+ namebuf[sizeof h->linkname] = '\0';
+ name = namebuf;
+ }
+ assign_string (¤t_link_name, name);
+ if (next_long_link)
+ {
+ free (next_long_link);
+ next_long_link = 0;
+ }
+
return HEADER_SUCCESS;
}
}
format = V7_FORMAT;
*format_pointer = format;
- stat_info->st_mode = from_oct (8, header->header.mode);
- stat_info->st_mode &= 07777;
- stat_info->st_mtime = from_oct (1 + 12, header->header.mtime);
+ stat_info->st_mode = MODE_FROM_HEADER (header->header.mode);
+ stat_info->st_mtime = TIME_FROM_HEADER (header->header.mtime);
if (format == OLDGNU_FORMAT && incremental_option)
{
- stat_info->st_atime = from_oct (1 + 12, header->oldgnu_header.atime);
- stat_info->st_ctime = from_oct (1 + 12, header->oldgnu_header.ctime);
+ stat_info->st_atime = TIME_FROM_HEADER (header->oldgnu_header.atime);
+ stat_info->st_ctime = TIME_FROM_HEADER (header->oldgnu_header.ctime);
}
if (format == V7_FORMAT)
{
- stat_info->st_uid = from_oct (8, header->header.uid);
- stat_info->st_gid = from_oct (8, header->header.gid);
+ 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;
}
else
if (numeric_owner_option
|| !*header->header.uname
|| !uname_to_uid (header->header.uname, &stat_info->st_uid))
- stat_info->st_uid = from_oct (8, header->header.uid);
+ stat_info->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 = from_oct (8, header->header.gid);
+ stat_info->st_gid = GID_FROM_HEADER (header->header.gid);
}
switch (header->header.typeflag)
{
-#ifdef S_IFBLK
case BLKTYPE:
- stat_info->st_rdev = makedev (from_oct (8, header->header.devmajor),
- from_oct (8, header->header.devminor));
+ stat_info->st_rdev
+ = makedev (MAJOR_FROM_HEADER (header->header.devmajor),
+ MINOR_FROM_HEADER (header->header.devminor));
break;
-#endif
-#ifdef S_IFCHR
case CHRTYPE:
- stat_info->st_rdev = makedev (from_oct (8, header->header.devmajor),
- from_oct (8, header->header.devminor));
+ stat_info->st_rdev
+ = makedev (MAJOR_FROM_HEADER (header->header.devmajor),
+ MINOR_FROM_HEADER (header->header.devminor));
break;
-#endif
default:
stat_info->st_rdev = 0;
}
/*------------------------------------------------------------------------.
-| Quick and dirty octal conversion. Result is -1 if the field is invalid |
-| (all blank, or nonoctal). |
+| 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. |
`------------------------------------------------------------------------*/
-long
-from_oct (int digs, char *where)
+static uintmax_t
+from_header (char const *where0, size_t digs, char const *type,
+ uintmax_t minus_minval, uintmax_t maxval)
{
- long value;
+ uintmax_t value;
+ char const *where = where0;
+ char const *lim = where + digs;
+ int negative = 0;
- while (ISSPACE (*where))
- { /* skip spaces */
+ /* Accommodate buggy tar of unknown vintage, which outputs leading
+ NUL if the previous field overflows. */
+ where += !*where;
+
+ /* Accommodate older tars, which output leading spaces. */
+ for (;;)
+ {
+ if (where == lim)
+ {
+ if (type)
+ ERROR ((0, 0,
+ _("Blanks in header where numeric %s value expected"),
+ type));
+ return -1;
+ }
+ if (!ISSPACE ((unsigned char) *where))
+ break;
where++;
- if (--digs <= 0)
- return -1; /* all blank field */
}
+
value = 0;
- while (digs > 0 && ISODIGIT (*where))
+ if (ISODIGIT (*where))
{
- /* Scan til nonoctal. */
+ char const *where1 = where;
+ uintmax_t overflow = 0;
+
+ for (;;)
+ {
+ value += *where++ - '0';
+ if (where == lim || ! ISODIGIT (*where))
+ break;
+ overflow |= value ^ (value << LG_8 >> LG_8);
+ value <<= LG_8;
+ }
- value = (value << 3) | (*where++ - '0');
- --digs;
+ /* Parse the output of older, unportable tars, which generate
+ negative values in two's complement octal. If the leading
+ 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)
+ {
+ /* Compute the negative of the input value, assuming two's
+ complement. */
+ int digit = (*where1 - '0') | 4;
+ overflow = 0;
+ value = 0;
+ where = where1;
+ for (;;)
+ {
+ value += 7 - digit;
+ where++;
+ if (where == lim || ! ISODIGIT (*where))
+ break;
+ digit = *where - '0';
+ overflow |= value ^ (value << LG_8 >> LG_8);
+ value <<= LG_8;
+ }
+ value++;
+ overflow |= !value;
+
+ 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));
+ negative = 1;
+ }
+ }
+
+ if (overflow)
+ {
+ ERROR ((0, 0,
+ _("Archive octal value %.*s is out of %s range"),
+ (int) (where - where1), where1, type));
+ return -1;
+ }
}
+ else if (type)
+ {
+ /* The following forms cannot appear as checksums, so we don't
+ check for them if TYPE is null. */
- if (digs > 0 && *where && !ISSPACE (*where))
- return -1; /* ended on non-space/nul */
+ 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)
+ {
+ 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)
+ {
+ ERROR ((0, 0,
+ _("Archive signed base-64 string `%.*s' is out of %s range"),
+ (int) digs, where0, type));
+ return -1;
+ }
+ value = (value << LG_64) | dig;
+ where++;
+ }
+ }
+ 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 (;;)
+ {
+ 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;
+ }
+ }
+ negative = signbit;
+ if (negative)
+ value = -value;
+ }
+ }
+
+ if (where != lim && *where && !ISSPACE ((unsigned char) *where))
+ {
+ if (type)
+ {
+ char buf[1000]; /* Big enough to represent any header. */
+ static struct quoting_options *o;
+
+ if (!o)
+ {
+ o = clone_quoting_options (0);
+ set_quoting_style (o, locale_quoting_style);
+ }
+
+ 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));
+ }
+
+ return -1;
+ }
+
+ if (value <= (negative ? minus_minval : maxval))
+ return negative ? -value : value;
+
+ if (type)
+ {
+ char minval_buf[UINTMAX_STRSIZE_BOUND + 1];
+ char maxval_buf[UINTMAX_STRSIZE_BOUND];
+ char value_buf[UINTMAX_STRSIZE_BOUND + 1];
+ char *minval_string = STRINGIFY_BIGINT (minus_minval, minval_buf + 1);
+ char *value_string = STRINGIFY_BIGINT (value, value_buf + 1);
+ if (negative)
+ *--value_string = '-';
+ if (minus_minval)
+ *--minval_string = '-';
+ ERROR ((0, 0, _("Archive value %s is out of %s range %s..%s"),
+ value_string, type,
+ minval_string, STRINGIFY_BIGINT (maxval, maxval_buf)));
+ }
- return value;
+ return -1;
}
-#if !USE_OLD_CTIME
+gid_t
+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));
+}
-/*-------------------------------------------.
-| Return the time formatted along ISO 8601. |
-`-------------------------------------------*/
+major_t
+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));
+}
-/* Also, see http://www.ft.uni-erlangen.de/~mskuhn/iso-time.html. */
+minor_t
+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));
+}
-static char *
-isotime (const time_t *time)
+mode_t
+mode_from_header (const char *p, size_t s)
{
- static char buffer[21];
- struct tm *tm;
-
- tm = localtime (time);
- sprintf (buffer, "%4d-%02d-%02d %02d:%02d:%02d\n",
- tm->tm_year + 1900, tm->tm_mon + 1, tm->tm_mday,
- tm->tm_hour, tm->tm_min, tm->tm_sec);
- return buffer;
+ /* 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));
+ return ((u & TSUID ? S_ISUID : 0)
+ | (u & TSGID ? S_ISGID : 0)
+ | (u & TSVTX ? S_ISVTX : 0)
+ | (u & TUREAD ? S_IRUSR : 0)
+ | (u & TUWRITE ? S_IWUSR : 0)
+ | (u & TUEXEC ? S_IXUSR : 0)
+ | (u & TGREAD ? S_IRGRP : 0)
+ | (u & TGWRITE ? S_IWGRP : 0)
+ | (u & TGEXEC ? S_IXGRP : 0)
+ | (u & TOREAD ? S_IROTH : 0)
+ | (u & TOWRITE ? S_IWOTH : 0)
+ | (u & TOEXEC ? S_IXOTH : 0));
}
-#endif /* not USE_OLD_CTIME */
+off_t
+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));
+}
-/*-------------------------------------------------------------------------.
-| Decode MODE from its binary form in a stat structure, and encode it into |
-| a 9 characters string STRING, terminated with a NUL. |
-`-------------------------------------------------------------------------*/
+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));
+}
-static void
-decode_mode (unsigned mode, char *string)
+time_t
+time_from_header (const char *p, size_t s)
+{
+ time_t t = from_header (p, s, "time_t",
+ - (uintmax_t) TYPE_MINIMUM (time_t),
+ (uintmax_t) TYPE_MAXIMUM (time_t));
+ if (start_time < t && time (0) < t)
+ WARN ((0, 0, _("Archive contains future timestamp %s"), tartime (t)));
+ return t;
+}
+
+uid_t
+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
+uintmax_from_header (const char *p, size_t s)
+{
+ return from_header (p, s, "uintmax_t", (uintmax_t) 0,
+ TYPE_MAXIMUM (uintmax_t));
+}
+
+
+/*----------------------------------------------------------------------.
+| 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)
{
- unsigned mask;
- const char *rwx = "rwxrwxrwx";
-
- for (mask = 0400; mask != 0; mask >>= 1)
- if (mode & mask)
- *string++ = *rwx++;
- else
- {
- *string++ = '-';
- rwx++;
- }
-
- if (mode & S_ISUID)
- string[-7] = string[-7] == 'x' ? 's' : 'S';
- if (mode & S_ISGID)
- string[-4] = string[-4] == 'x' ? 's' : 'S';
- if (mode & S_ISVTX)
- string[-1] = string[-1] == 'x' ? 't' : 'T';
-
- *string = '\0';
+ *--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. */
+char const *
+tartime (time_t t)
+{
+ static char buffer[max (UINTMAX_STRSIZE_BOUND + 1,
+ INT_STRLEN_BOUND (int) + 16)];
+ char *p;
+
+#if USE_OLD_CTIME
+ p = ctime (&t);
+ if (p)
+ {
+ char const *time_stamp = p + 4;
+ for (p += 16; p[4] != '\n'; p++)
+ p[0] = p[4];
+ p[0] = '\0';
+ return time_stamp;
+ }
+#else
+ /* Use ISO 8610 format. See:
+ http://www.cl.cam.ac.uk/~mgk25/iso-time.html */
+ 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,
+ tm->tm_hour, tm->tm_min, tm->tm_sec);
+ return buffer;
+ }
+#endif
+
+ /* The time stamp cannot be broken down, most likely because it
+ is out of range. Convert it as an integer,
+ right-adjusted in a field with the same width as the usual
+ 19-byte 4-year ISO time format. */
+ p = stringify_uintmax_t_backwards (t < 0 ? - (uintmax_t) t : (uintmax_t) t,
+ buffer + sizeof buffer);
+ if (t < 0)
+ *--p = '-';
+ while (buffer + sizeof buffer - 19 - 1 < p)
+ *--p = ' ';
+ return p;
}
/*-------------------------------------------------------------------------.
print_header (void)
{
char modes[11];
- char *timestamp;
- char uform[11], gform[11]; /* these hold formatted ints */
+ char const *time_stamp;
+ /* These hold formatted ints. */
+ char uform[UINTMAX_STRSIZE_BOUND], gform[UINTMAX_STRSIZE_BOUND];
char *user, *group;
- char size[24]; /* holds a formatted long or maj, min */
- time_t longie; /* to make ctime() call portable */
+ char size[2 * UINTMAX_STRSIZE_BOUND];
+ /* holds formatted size or major,minor */
+ char uintbuf[UINTMAX_STRSIZE_BOUND];
int pad;
- char *name;
if (block_number_option)
- fprintf (stdlis, _("block %10ld: "), current_block_ordinal ());
+ {
+ char buf[UINTMAX_STRSIZE_BOUND];
+ fprintf (stdlis, _("block %s: "),
+ STRINGIFY_BIGINT (current_block_ordinal (), buf));
+ }
if (verbose_option <= 1)
{
/* Just the fax, mam. */
-
- char *quoted_name = quote_copy_string (current_file_name);
-
- if (quoted_name)
- {
- fprintf (stdlis, "%s\n", quoted_name);
- free (quoted_name);
- }
- else
- fprintf (stdlis, "%s\n", current_file_name);
+ fprintf (stdlis, "%s\n", quotearg (current_file_name));
}
else
{
break;
}
- decode_mode ((unsigned) current_stat.st_mode, modes + 1);
+ decode_mode (current_stat.st_mode, modes + 1);
- /* Timestamp. */
+ /* Time stamp. */
- longie = current_stat.st_mtime;
-#if USE_OLD_CTIME
- timestamp = ctime (&longie);
- timestamp[16] = '\0';
- timestamp[24] = '\0';
-#else
- timestamp = isotime (&longie);
- timestamp[16] = '\0';
-#endif
+ time_stamp = tartime (current_stat.st_mtime);
/* User and group names. */
- if (*current_header->header.uname && current_format != V7_FORMAT)
+ if (*current_header->header.uname && current_format != V7_FORMAT
+ && !numeric_owner_option)
user = current_header->header.uname;
else
- {
- user = uform;
- sprintf (uform, "%ld", from_oct (8, current_header->header.uid));
- }
+ user = STRINGIFY_BIGINT (UINTMAX_FROM_HEADER
+ (current_header->header.uid),
+ uform);
- if (*current_header->header.gname && current_format != V7_FORMAT)
+ if (*current_header->header.gname && current_format != V7_FORMAT
+ && !numeric_owner_option)
group = current_header->header.gname;
else
- {
- group = gform;
- sprintf (gform, "%ld", from_oct (8, current_header->header.gid));
- }
+ group = STRINGIFY_BIGINT (UINTMAX_FROM_HEADER
+ (current_header->header.gid),
+ gform);
/* Format the file size or major/minor device numbers. */
switch (current_header->header.typeflag)
{
-#if defined(S_IFBLK) || defined(S_IFCHR)
case CHRTYPE:
case BLKTYPE:
- sprintf (size, "%d,%d",
- major (current_stat.st_rdev), minor (current_stat.st_rdev));
+ strcpy (size,
+ STRINGIFY_BIGINT (major (current_stat.st_rdev), uintbuf));
+ strcat (size, ",");
+ strcat (size,
+ STRINGIFY_BIGINT (minor (current_stat.st_rdev), uintbuf));
break;
-#endif
case GNUTYPE_SPARSE:
- sprintf (size, "%ld",
- from_oct (1 + 12, current_header->oldgnu_header.realsize));
+ strcpy (size,
+ STRINGIFY_BIGINT
+ (UINTMAX_FROM_HEADER (current_header
+ ->oldgnu_header.realsize),
+ uintbuf));
break;
default:
- sprintf (size, "%ld", (long) current_stat.st_size);
+ strcpy (size, STRINGIFY_BIGINT (current_stat.st_size, uintbuf));
+ break;
}
/* Figure out padding and print the whole line. */
if (pad > ugswidth)
ugswidth = pad;
-#if USE_OLD_CTIME
- fprintf (stdlis, "%s %s/%s %*s%s %s %s",
- modes, user, group, ugswidth - pad, "",
- size, timestamp + 4, timestamp + 20);
-#else
fprintf (stdlis, "%s %s/%s %*s%s %s",
- modes, user, group, ugswidth - pad, "", size, timestamp);
-#endif
+ modes, user, group, ugswidth - pad, "", size, time_stamp);
- name = quote_copy_string (current_file_name);
- if (name)
- {
- fprintf (stdlis, " %s", name);
- free (name);
- }
- else
- fprintf (stdlis, " %s", current_file_name);
+ fprintf (stdlis, " %s", quotearg (current_file_name));
switch (current_header->header.typeflag)
{
case SYMTYPE:
- name = quote_copy_string (current_link_name);
- if (name)
- {
- fprintf (stdlis, " -> %s\n", name);
- free (name);
- }
- else
- fprintf (stdlis, " -> %s\n", current_link_name);
+ fprintf (stdlis, " -> %s\n", quotearg (current_link_name));
break;
case LNKTYPE:
- name = quote_copy_string (current_link_name);
- if (name)
- {
- fprintf (stdlis, _(" link to %s\n"), name);
- free (name);
- }
- else
- fprintf (stdlis, _(" link to %s\n"), current_link_name);
+ fprintf (stdlis, _(" link to %s\n"), quotearg (current_link_name));
break;
default:
break;
case GNUTYPE_MULTIVOL:
- fprintf (stdlis, _("--Continued at byte %ld--\n"),
- from_oct (1 + 12, current_header->oldgnu_header.offset));
+ strcpy (size,
+ STRINGIFY_BIGINT
+ (UINTMAX_FROM_HEADER (current_header->oldgnu_header.offset),
+ uintbuf));
+ fprintf (stdlis, _("--Continued at byte %s--\n"), size);
break;
case GNUTYPE_NAMES:
`--------------------------------------------------------------*/
void
-print_for_mkdir (char *pathname, int length, int mode)
+print_for_mkdir (char *pathname, int length, mode_t mode)
{
char modes[11];
- char *name;
if (verbose_option > 1)
{
/* File type and modes. */
modes[0] = 'd';
- decode_mode ((unsigned) mode, modes + 1);
+ decode_mode (mode, modes + 1);
if (block_number_option)
- fprintf (stdlis, _("block %10ld: "), current_block_ordinal ());
- name = quote_copy_string (pathname);
- if (name)
{
- fprintf (stdlis, "%s %*s %.*s\n", modes, ugswidth + DATEWIDTH,
- _("Creating directory:"), length, name);
- free (name);
+ char buf[UINTMAX_STRSIZE_BOUND];
+ fprintf (stdlis, _("block %s: "),
+ STRINGIFY_BIGINT (current_block_ordinal (), buf));
}
- else
- fprintf (stdlis, "%s %*s %.*s\n", modes, ugswidth + DATEWIDTH,
- _("Creating directory:"), length, pathname);
+
+ fprintf (stdlis, "%s %*s %.*s\n", modes, ugswidth + DATEWIDTH,
+ _("Creating directory:"), length, quotearg (pathname));
}
}
`--------------------------------------------------------*/
void
-skip_file (long size)
+skip_file (off_t size)
{
union block *x;
while (size > 0)
{
x = find_next_block ();
- if (x == NULL)
- FATAL_ERROR ((0, 0, _("Unexpected EOF on archive file")));
+ if (! x)
+ FATAL_ERROR ((0, 0, _("Unexpected EOF in archive")));
set_next_block_after (x);
size -= BLOCKSIZE;
{
union block *exhdr;
- while (1)
+ do
{
exhdr = find_next_block ();
- if (!exhdr->sparse_header.isextended)
- {
- set_next_block_after (exhdr);
- break;
- }
+ if (!exhdr)
+ FATAL_ERROR ((0, 0, _("Unexpected EOF in archive")));
set_next_block_after (exhdr);
}
+ while (exhdr->sparse_header.isextended);
}