X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Flist.c;h=ddf044df0e1f1621b8669aceacbf42df43b2c297;hb=d659cbaccdc1f3279c49107cf15f15a639738529;hp=0657fcff036492fd4f9367de5303e9e2b0dccc12;hpb=0fd49f51a052c54a86f9dcc12d9820c897262fa8;p=chaz%2Ftar diff --git a/src/list.c b/src/list.c index 0657fcf..ddf044d 100644 --- a/src/list.c +++ b/src/list.c @@ -17,12 +17,10 @@ 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 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ - -/* Define to non-zero for forcing old ctime format instead of ISO format. */ -#undef USE_OLD_CTIME + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ #include +#include #include #include "common.h" @@ -68,6 +66,7 @@ read_and (void (*do_something) (void)) { enum read_header status = HEADER_STILL_UNREAD; enum read_header prev_status; + struct timespec mtime; base64_init (); name_gather (); @@ -95,13 +94,12 @@ read_and (void (*do_something) (void)) || (NEWER_OPTION_INITIALIZED (newer_mtime_option) /* FIXME: We get mtime now, and again later; this causes duplicate diagnostics if header.mtime is bogus. */ - && ((current_stat_info.stat.st_mtime + && ((mtime.tv_sec = TIME_FROM_HEADER (current_header->header.mtime)), -#ifdef ST_MTIM_NSEC /* FIXME: Grab fractional time stamps from extended header. */ - current_stat_info.stat.st_mtim.ST_MTIM_NSEC = 0, -#endif + mtime.tv_nsec = 0, + set_stat_mtime (¤t_stat_info.stat, mtime), OLDER_STAT_TIME (current_stat_info.stat, m))) || excluded_name (current_stat_info.file_name)) { @@ -222,7 +220,7 @@ list_archive (void) set_next_block_after (current_header); if (multi_volume_option) { - assign_string (&save_name, current_stat_info.file_name); + assign_string (&save_name, current_stat_info.orig_file_name); save_totsize = current_stat_info.stat.st_size; } for (size = current_stat_info.stat.st_size; size > 0; size -= written) @@ -258,7 +256,7 @@ list_archive (void) } if (multi_volume_option) - assign_string (&save_name, current_stat_info.file_name); + assign_string (&save_name, current_stat_info.orig_file_name); skip_member (); @@ -369,7 +367,8 @@ read_header (bool raw_extended_headers) if (header->header.typeflag == GNUTYPE_LONGNAME || header->header.typeflag == GNUTYPE_LONGLINK || header->header.typeflag == XHDTYPE - || header->header.typeflag == XGLTYPE) + || header->header.typeflag == XGLTYPE + || header->header.typeflag == SOLARIS_XHDTYPE) { if (raw_extended_headers) return HEADER_SUCCESS_EXTENDED; @@ -427,7 +426,8 @@ read_header (bool raw_extended_headers) *bp = '\0'; } - else if (header->header.typeflag == XHDTYPE) + else if (header->header.typeflag == XHDTYPE + || header->header.typeflag == SOLARIS_XHDTYPE) xheader_read (header, OFF_FROM_HEADER (header->header.size)); else if (header->header.typeflag == XGLTYPE) { @@ -520,6 +520,9 @@ 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) { @@ -541,22 +544,31 @@ 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); - stat_info->stat.st_mtime = TIME_FROM_HEADER (header->header.mtime); + mtime.tv_sec = TIME_FROM_HEADER (header->header.mtime); + mtime.tv_nsec = 0; + set_stat_mtime (&stat_info->stat, mtime); assign_string (&stat_info->uname, header->header.uname[0] ? header->header.uname : NULL); assign_string (&stat_info->gname, header->header.gname[0] ? header->header.gname : NULL); - 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->stat.st_atime = TIME_FROM_HEADER (header->oldgnu_header.atime); - stat_info->stat.st_ctime = TIME_FROM_HEADER (header->oldgnu_header.ctime); + 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; } + 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; + } + else + atime = ctime = start_time; + + set_stat_atime (&stat_info->stat, atime); + set_stat_ctime (&stat_info->stat, ctime); if (format == V7_FORMAT) { @@ -566,13 +578,6 @@ decode_header (union block *header, struct tar_stat_info *stat_info, } 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. */ @@ -592,8 +597,9 @@ decode_header (union block *header, struct tar_stat_info *stat_info, { case BLKTYPE: case CHRTYPE: - stat_info->stat.st_rdev = makedev (stat_info->devmajor, - stat_info->devminor); + stat_info->stat.st_rdev = + makedev (MAJOR_FROM_HEADER (header->header.devmajor), + MINOR_FROM_HEADER (header->header.devminor)); break; default: @@ -918,61 +924,61 @@ uintmax_from_header (const char *p, size_t s) } -/* 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) -{ - *--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. */ + function, to ctime, or to asctime. If FULL_TIME, then output the + time stamp to its full resolution; otherwise, just output it to + 1-minute resolution. */ char const * -tartime (time_t t) +tartime (struct timespec t, bool full_time) { + enum { fraclen = sizeof ".FFFFFFFFF" - 1 }; static char buffer[max (UINTMAX_STRSIZE_BOUND + 1, - INT_STRLEN_BOUND (int) + 16)]; + INT_STRLEN_BOUND (int) + 16) + + fraclen]; + struct tm *tm; + time_t s = t.tv_sec; + int ns = t.tv_nsec; + bool negative = s < 0; char *p; -#if USE_OLD_CTIME - p = ctime (&t); - if (p) + if (negative && ns != 0) { - char const *time_stamp = p + 4; - for (p += 16; p[3] != '\n'; p++) - p[0] = p[3]; - p[0] = '\0'; - return time_stamp; + s++; + ns = 1000000000 - ns; } -#else - /* Use ISO 8610 format. See: - http://www.cl.cam.ac.uk/~mgk25/iso-time.html */ - struct tm *tm = utc_option ? gmtime (&t) : localtime (&t); + + tm = utc_option ? gmtime (&s) : localtime (&s); if (tm) { - 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); + if (full_time) + { + 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); + code_ns_fraction (ns, buffer + strlen (buffer)); + } + else + sprintf (buffer, "%04ld-%02d-%02d %02d:%02d", + tm->tm_year + 1900L, tm->tm_mon + 1, tm->tm_mday, + tm->tm_hour, tm->tm_min); 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) + 4-year ISO time format. */ + p = umaxtostr (negative ? - (uintmax_t) s : s, + buffer + sizeof buffer - UINTMAX_STRSIZE_BOUND - fraclen); + if (negative) *--p = '-'; - while (buffer + sizeof buffer - 19 - 1 < p) + while ((buffer + sizeof buffer - sizeof "YYYY-MM-DD HH:MM" + + (full_time ? sizeof ":SS.FFFFFFFFF" - 1 : 0)) + < p) *--p = ' '; + if (full_time) + code_ns_fraction (ns, buffer + sizeof buffer - 1 - fraclen); return p; } @@ -989,23 +995,24 @@ 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.. */ -/* UGSWIDTH starts with 18, so with user and group names <= 8 chars, the - columns never shift during the listing. */ -#define UGSWIDTH 18 -static int ugswidth = UGSWIDTH; /* maximum width encountered so far */ +/* Width of "user/group size", with initial value chosen + heuristically. This grows as needed, though this may cause some + stairstepping in the output. Make it too small and the output will + almost always look ragged. Make it too large and the output will + be spaced out too far. */ +static int ugswidth = 19; -/* DATEWIDTH is the number of columns taken by the date and time fields. */ -#if USE_OLD_CDATE -# define DATEWIDTH 19 -#else -# define DATEWIDTH 18 -#endif +/* Width of printed time stamps. It grows if longer time stamps are + found (typically, those with nanosecond resolution). Like + USGWIDTH, some stairstepping may occur. */ +static int datewidth = sizeof "YYYY-MM-DD HH:MM" - 1; void 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; /* These hold formatted ints. */ @@ -1015,6 +1022,7 @@ print_header (struct tar_stat_info *st, off_t block_ordinal) /* holds formatted size or major,minor */ char uintbuf[UINTMAX_STRSIZE_BOUND]; int pad; + int sizelen; if (block_number_option) { @@ -1090,11 +1098,14 @@ print_header (struct tar_stat_info *st, off_t block_ordinal) break; } - decode_mode (st->stat.st_mode, modes + 1); + pax_decode_mode (st->stat.st_mode, modes + 1); /* Time stamp. */ - time_stamp = tartime (st->stat.st_mtime); + time_stamp = tartime (get_stat_mtime (&st->stat), false); + time_stamp_len = strlen (time_stamp); + if (datewidth < time_stamp_len) + datewidth = time_stamp_len; /* User and group names. */ @@ -1169,12 +1180,14 @@ print_header (struct tar_stat_info *st, off_t block_ordinal) /* Figure out padding and print the whole line. */ - pad = strlen (user) + strlen (group) + strlen (size) + 1; + sizelen = strlen (size); + pad = strlen (user) + 1 + strlen (group) + 1 + sizelen; if (pad > ugswidth) ugswidth = pad; - fprintf (stdlis, "%s %s/%s %*s%s %s", - modes, user, group, ugswidth - pad, "", size, time_stamp); + fprintf (stdlis, "%s %s/%s %*s %-*s", + modes, user, group, ugswidth - pad + sizelen, size, + datewidth, time_stamp); fprintf (stdlis, " %s", quotearg (temp_name)); @@ -1249,7 +1262,7 @@ print_for_mkdir (char *dirname, int length, mode_t mode) /* File type and modes. */ modes[0] = 'd'; - decode_mode (mode, modes + 1); + pax_decode_mode (mode, modes + 1); if (block_number_option) { @@ -1258,7 +1271,7 @@ print_for_mkdir (char *dirname, int length, mode_t mode) STRINGIFY_BIGINT (current_block_ordinal (), buf)); } - fprintf (stdlis, "%s %*s %.*s\n", modes, ugswidth + DATEWIDTH, + fprintf (stdlis, "%s %*s %.*s\n", modes, ugswidth + 1 + datewidth, _("Creating directory:"), length, quotearg (dirname)); } } @@ -1309,7 +1322,7 @@ skip_member (void) char save_typeflag = current_header->header.typeflag; set_next_block_after (current_header); - assign_string (&save_name, current_stat_info.file_name); + assign_string (&save_name, current_stat_info.orig_file_name); if (current_stat_info.is_sparse) sparse_skip_file (¤t_stat_info);