X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Flist.c;h=4bca28c21b2c144f4b59915cc1c218b510ba9707;hb=203dea13a40bae5c6d2dfa221036babd0e345ffe;hp=c58eae41b44f082b2c5ac03938c5540297c1a0f8;hpb=be4c265a8d26361c843c46ace0e88c14062a4213;p=chaz%2Ftar diff --git a/src/list.c b/src/list.c index c58eae4..4bca28c 100644 --- a/src/list.c +++ b/src/list.c @@ -24,18 +24,27 @@ #include -#ifndef FNM_LEADING_DIR -# include -#endif - #include "common.h" 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_oct PARAMS ((const char *, size_t, const char *, uintmax_t)); +static uintmax_t from_chars PARAMS ((const char *, size_t, const char *, + uintmax_t, uintmax_t)); +/* 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[1 + (unsigned char) -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. | @@ -48,6 +57,7 @@ read_and (void (*do_something) ()) enum read_header prev_status; char save_typeflag; + base64_init (); name_gather (); open_archive (ACCESS_READ); @@ -66,11 +76,12 @@ read_and (void (*do_something) ()) Ensure incoming names are null terminated. */ /* FIXME: This is a quick kludge before 1.12 goes out. */ - current_stat.st_mtime = TIME_FROM_OCT (current_header->header.mtime); + current_stat.st_mtime + = TIME_FROM_CHARS (current_header->header.mtime); if (!name_match (current_file_name) || current_stat.st_mtime < newer_mtime_option - || excluded_pathname (excluded, current_file_name)) + || excluded_name (current_file_name)) { int isextended = 0; @@ -327,9 +338,10 @@ read_header (void) if (!header) return HEADER_END_OF_FILE; - parsed_sum = from_oct (header->header.chksum, - sizeof header->header.chksum, - (char *) 0, TYPE_MAXIMUM (long)); + parsed_sum = from_chars (header->header.chksum, + sizeof header->header.chksum, + (char *) 0, (uintmax_t) 0, + (uintmax_t) TYPE_MAXIMUM (long)); if (parsed_sum == (uintmax_t) -1) return HEADER_FAILURE; @@ -372,7 +384,7 @@ read_header (void) if (header->header.typeflag == LNKTYPE) current_stat.st_size = 0; /* links 0 size on tape */ else - current_stat.st_size = OFF_FROM_OCT (header->header.size); + current_stat.st_size = OFF_FROM_CHARS (header->header.size); header->header.name[NAME_FIELD_SIZE - 1] = '\0'; if (header->header.typeflag == GNUTYPE_LONGNAME @@ -421,8 +433,10 @@ read_header (void) { /* Accept file names as specified by POSIX.1-1996 section 10.1.1. */ + int is_posix = (strcmp (h->magic, TMAGIC) == 0); char *np = namebuf; - if (h->prefix[0]) + + if (is_posix && h->prefix[0]) { memcpy (np, h->prefix, sizeof h->prefix); np[sizeof h->prefix] = '\0'; @@ -474,19 +488,19 @@ decode_header (union block *header, struct stat *stat_info, format = V7_FORMAT; *format_pointer = format; - stat_info->st_mode = MODE_FROM_OCT (header->header.mode); - stat_info->st_mtime = TIME_FROM_OCT (header->header.mtime); + stat_info->st_mode = MODE_FROM_CHARS (header->header.mode); + stat_info->st_mtime = TIME_FROM_CHARS (header->header.mtime); if (format == OLDGNU_FORMAT && incremental_option) { - stat_info->st_atime = TIME_FROM_OCT (header->oldgnu_header.atime); - stat_info->st_ctime = TIME_FROM_OCT (header->oldgnu_header.ctime); + stat_info->st_atime = TIME_FROM_CHARS (header->oldgnu_header.atime); + stat_info->st_ctime = TIME_FROM_CHARS (header->oldgnu_header.ctime); } if (format == V7_FORMAT) { - stat_info->st_uid = UID_FROM_OCT (header->header.uid); - stat_info->st_gid = GID_FROM_OCT (header->header.gid); + stat_info->st_uid = UID_FROM_CHARS (header->header.uid); + stat_info->st_gid = GID_FROM_CHARS (header->header.gid); stat_info->st_rdev = 0; } else @@ -498,30 +512,26 @@ decode_header (union block *header, struct stat *stat_info, if (numeric_owner_option || !*header->header.uname || !uname_to_uid (header->header.uname, &stat_info->st_uid)) - stat_info->st_uid = UID_FROM_OCT (header->header.uid); + stat_info->st_uid = UID_FROM_CHARS (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_OCT (header->header.gid); + stat_info->st_gid = GID_FROM_CHARS (header->header.gid); } switch (header->header.typeflag) { -#ifdef S_ISBLK case BLKTYPE: stat_info->st_rdev - = makedev (MAJOR_FROM_OCT (header->header.devmajor), - MINOR_FROM_OCT (header->header.devminor)); + = makedev (MAJOR_FROM_CHARS (header->header.devmajor), + MINOR_FROM_CHARS (header->header.devminor)); break; -#endif -#ifdef S_ISCHR case CHRTYPE: stat_info->st_rdev - = makedev (MAJOR_FROM_OCT (header->header.devmajor), - MINOR_FROM_OCT (header->header.devminor)); + = makedev (MAJOR_FROM_CHARS (header->header.devmajor), + MINOR_FROM_CHARS (header->header.devminor)); break; -#endif default: stat_info->st_rdev = 0; @@ -530,44 +540,71 @@ decode_header (union block *header, struct stat *stat_info, } /*------------------------------------------------------------------------. -| 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. | `------------------------------------------------------------------------*/ static uintmax_t -from_oct (const char *where0, size_t digs0, const char *type, uintmax_t maxval) +from_chars (char const *where0, size_t digs, char const *type, + uintmax_t minus_minval, uintmax_t maxval) { uintmax_t value; - const char *where = where0; - size_t digs = digs0; + char const *where = where0; + char const *lim = where + digs; + int negative = 0; for (;;) { - if (digs == 0) + if (where == lim) { if (type) - ERROR ((0, 0, _("Blanks in header where octal %s value expected"), + ERROR ((0, 0, + _("Blanks in header where numeric %s value expected"), type)); return -1; } if (!ISSPACE ((unsigned char) *where)) break; where++; - digs--; } value = 0; - while (digs != 0 && ISODIGIT (*where)) + if (ISODIGIT (*where)) { - /* Scan til nonoctal. */ + do + { + if (value << LG_8 >> LG_8 != value) + goto out_of_range; + value = (value << LG_8) | (*where++ - '0'); + } + while (where != lim && ISODIGIT (*where)); - if (value << 3 >> 3 != value) - goto out_of_range; - value = (value << 3) | (*where++ - '0'); - --digs; + /* Parse the output of older tars, which output negative values + in two's complement octal. This method works only if the + type has the same number of bits as it did on the host that + created the tar file, but that's the best we can do. */ + if (maxval < value && value - maxval <= minus_minval) + { + value = minus_minval - (value - maxval); + negative = 1; + } + } + else if (*where == '-' || *where == '+') + { + int dig; + negative = *where++ == '-'; + while (where != lim + && (dig = base64_map[(unsigned char) *where]) < 64) + { + if (value << LG_64 >> LG_64 != value) + goto out_of_range; + value = (value << LG_64) | dig; + where++; + } } - if (digs != 0 && *where && !ISSPACE ((unsigned char) *where)) + if (where != lim && *where && !ISSPACE ((unsigned char) *where)) { if (type) { @@ -580,46 +617,58 @@ from_oct (const char *where0, size_t digs0, const char *type, uintmax_t maxval) set_quoting_style (o, c_quoting_style); } - for (digs = digs0; digs && ! where0[digs - 1]; digs--) - continue; - quotearg_buffer (buf, sizeof buf, where0, digs, o); + while (where0 != lim && ! lim[-1]) + lim--; + quotearg_buffer (buf, sizeof buf, where0, lim - where, o); ERROR ((0, 0, - _("Header contains %.*s where octal %s value expected"), + _("Header contains `%.*s' where numeric %s value expected"), (int) sizeof buf, buf, type)); } return -1; } - if (value <= maxval) - return value; + if (value <= (negative ? minus_minval : maxval)) + return negative ? -value : value; out_of_range: if (type) - ERROR ((0, 0, _("Octal value `%.*s' is out of range for %s"), - (int) digs0, where0, type)); + ERROR ((0, 0, _("Numeric value `%.*s' is out of range for %s"), + (int) digs, where0, type)); return -1; } + gid_t -gid_from_oct (const char *p, size_t s) +gid_from_chars (const char *p, size_t s) { - return from_oct (p, s, "gid_t", (uintmax_t) TYPE_MAXIMUM (gid_t)); + return from_chars (p, s, "gid_t", + - (uintmax_t) TYPE_MINIMUM (gid_t), + (uintmax_t) TYPE_MAXIMUM (gid_t)); } + major_t -major_from_oct (const char *p, size_t s) +major_from_chars (const char *p, size_t s) { - return from_oct (p, s, "major_t", (uintmax_t) TYPE_MAXIMUM (major_t)); + return from_chars (p, s, "major_t", + - (uintmax_t) TYPE_MINIMUM (major_t), + (uintmax_t) TYPE_MAXIMUM (major_t)); } + minor_t -minor_from_oct (const char *p, size_t s) +minor_from_chars (const char *p, size_t s) { - return from_oct (p, s, "minor_t", (uintmax_t) TYPE_MAXIMUM (minor_t)); + return from_chars (p, s, "minor_t", + - (uintmax_t) TYPE_MINIMUM (minor_t), + (uintmax_t) TYPE_MAXIMUM (minor_t)); } + mode_t -mode_from_oct (const char *p, size_t s) +mode_from_chars (const char *p, size_t s) { /* Do not complain about unrecognized mode bits. */ - unsigned u = from_oct (p, s, "mode_t", TYPE_MAXIMUM (uintmax_t)); + unsigned u = from_chars (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) @@ -633,34 +682,45 @@ mode_from_oct (const char *p, size_t s) | (u & TOWRITE ? S_IWOTH : 0) | (u & TOEXEC ? S_IXOTH : 0)); } + off_t -off_from_oct (const char *p, size_t s) +off_from_chars (const char *p, size_t s) { - return from_oct (p, s, "off_t", (uintmax_t) TYPE_MAXIMUM (off_t)); + return from_chars (p, s, "off_t", + - (uintmax_t) TYPE_MINIMUM (off_t), + (uintmax_t) TYPE_MAXIMUM (off_t)); } + size_t -size_from_oct (const char *p, size_t s) +size_from_chars (const char *p, size_t s) { - return from_oct (p, s, "size_t", (uintmax_t) TYPE_MAXIMUM (size_t)); + return from_chars (p, s, "size_t", (uintmax_t) 0, + (uintmax_t) TYPE_MAXIMUM (size_t)); } + time_t -time_from_oct (const char *p, size_t s) +time_from_chars (const char *p, size_t s) { - return from_oct (p, s, "time_t", (uintmax_t) TYPE_MAXIMUM (time_t)); + return from_chars (p, s, "time_t", + - (uintmax_t) TYPE_MINIMUM (time_t), + (uintmax_t) TYPE_MAXIMUM (time_t)); } + uid_t -uid_from_oct (const char *p, size_t s) +uid_from_chars (const char *p, size_t s) { - return from_oct (p, s, "uid_t", (uintmax_t) TYPE_MAXIMUM (uid_t)); + return from_chars (p, s, "uid_t", (uintmax_t) 0, + (uintmax_t) TYPE_MAXIMUM (uid_t)); } + uintmax_t -uintmax_from_oct (const char *p, size_t s) +uintmax_from_chars (const char *p, size_t s) { - return from_oct (p, s, "uintmax_t", TYPE_MAXIMUM (uintmax_t)); + return from_chars (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. | @@ -686,13 +746,16 @@ stringify_uintmax_t_backwards (uintmax_t o, char *buf) static char * isotime (const time_t *time) { - static char buffer[21]; - struct tm *tm; + static char buffer[INT_STRLEN_BOUND (int) + 16]; + struct tm *tm = localtime (time); + 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); + else + /* Interpose %s between ?? and - to avoid ANSI C trigraph brain damage. */ + sprintf (buffer, "????%s-??%s-?? ??:??:??", "", ""); - 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; } @@ -754,7 +817,7 @@ void print_header (void) { char modes[11]; - char *timestamp; + char const *timestamp; /* These hold formatted ints. */ char uform[UINTMAX_STRSIZE_BOUND], gform[UINTMAX_STRSIZE_BOUND]; char *user, *group; @@ -847,26 +910,37 @@ print_header (void) longie = current_stat.st_mtime; #if USE_OLD_CTIME - timestamp = ctime (&longie); - timestamp[16] = '\0'; - timestamp[24] = '\0'; + { + char *ct = ctime (&longie); + if (ct) + { + timestamp = ct + 4; + for (ct += 16; ct[4] != '\n'; ct++) + ct[0] = ct[4]; + ct[0] = '\0'; + } + else + timestamp = "??? ?? ??:?? ????"; + } #else timestamp = isotime (&longie); - timestamp[16] = '\0'; #endif /* 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 = STRINGIFY_BIGINT (UINTMAX_FROM_OCT (current_header->header.uid), + user = STRINGIFY_BIGINT (UINTMAX_FROM_CHARS + (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 = STRINGIFY_BIGINT (UINTMAX_FROM_OCT + group = STRINGIFY_BIGINT (UINTMAX_FROM_CHARS (current_header->header.gid), gform); @@ -874,18 +948,16 @@ print_header (void) switch (current_header->header.typeflag) { -#if defined S_ISBLK || defined S_ISCHR case CHRTYPE: case BLKTYPE: sprintf (size, "%lu,%lu", (unsigned long) major (current_stat.st_rdev), (unsigned long) minor (current_stat.st_rdev)); break; -#endif case GNUTYPE_SPARSE: strcpy (size, STRINGIFY_BIGINT - (UINTMAX_FROM_OCT (current_header->oldgnu_header.realsize), + (UINTMAX_FROM_CHARS (current_header->oldgnu_header.realsize), uintbuf)); break; default: @@ -899,14 +971,8 @@ print_header (void) 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 name = quote_copy_string (current_file_name); if (name) @@ -965,7 +1031,7 @@ print_header (void) case GNUTYPE_MULTIVOL: strcpy (size, STRINGIFY_BIGINT - (UINTMAX_FROM_OCT (current_header->oldgnu_header.offset), + (UINTMAX_FROM_CHARS (current_header->oldgnu_header.offset), uintbuf)); fprintf (stdlis, _("--Continued at byte %s--\n"), size); break;