Relicense under GPLv3

[chaz/tar] / src / list.c

diff --git a/src/list.c b/src/list.c
index 16a6970a58f618c1c16aeb0c5ccd2d6b0757134c..c9cdf8246fbf2134f7846aacc4ea91ee9532f195 100644 (file)
--- a/src/list.c
+++ b/src/list.c
@@ -1,13 +1,13 @@
 /* List a tar archive, with support routines for reading a tar archive.
 
    Copyright (C) 1988, 1992, 1993, 1994, 1996, 1997, 1998, 1999, 2000,
 /* 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, 2007 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
    under the terms of the GNU General Public License as published by the
 
    Written by John Gilmore, on 1985-08-26.
 
    This program is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the

-   Free Software Foundation; either version 2, or (at your option) any later
+   Free Software Foundation; either version 3, or (at your option) any later

    version.
 
    This program is distributed in the hope that it will be useful, but
    version.
 
    This program is distributed in the hope that it will be useful, but


@@ -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.,
 
    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 <system.h>
 
 #include <system.h>

+#include <inttostr.h>

 #include <quotearg.h>
 
 #include "common.h"
 #include <quotearg.h>
 
 #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;
 {
   enum read_header status = HEADER_STILL_UNREAD;
   enum read_header prev_status;

+  struct timespec mtime;

 
   base64_init ();
   name_gather ();
 
   base64_init ();
   name_gather ();


@@ -77,7 +76,6 @@ read_and (void (*do_something) (void))
     {
       prev_status = status;
       tar_stat_destroy (&current_stat_info);
     {
       prev_status = status;
       tar_stat_destroy (&current_stat_info);

-      xheader_destroy (&extended_header);

 
       status = read_header (false);
       switch (status)
 
       status = read_header (false);
       switch (status)


@@ -95,21 +93,19 @@ 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.  */
              || (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)),
                       = TIME_FROM_HEADER (current_header->header.mtime)),

-#ifdef ST_MTIM_NSEC

                      /* FIXME: Grab fractional time stamps from
                         extended header.  */
                      /* FIXME: Grab fractional time stamps from
                         extended header.  */

-                     current_stat_info.stat.st_mtim.ST_MTIM_NSEC = 0,
-#endif
-                     OLDER_STAT_TIME (current_stat_info.stat, m)))
+                     mtime.tv_nsec = 0,
+                     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:
              || excluded_name (current_stat_info.file_name))
            {
              switch (current_header->header.typeflag)
                {
                case GNUTYPE_VOLHDR:
                case GNUTYPE_MULTIVOL:

-               case GNUTYPE_NAMES:

                  break;
 
                case DIRTYPE:
                  break;
 
                case DIRTYPE:


@@ -207,63 +203,24 @@ read_and (void (*do_something) (void))
 void
 list_archive (void)
 {
 void
 list_archive (void)
 {

+  off_t block_ordinal = current_block_ordinal ();

   /* Print the header block.  */
 
   decode_header (current_header, &current_stat_info, &current_format, 0);
   if (verbose_option)
   /* Print the header block.  */
 
   decode_header (current_header, &current_stat_info, &current_format, 0);
   if (verbose_option)

-    print_header (&current_stat_info, -1);
+    print_header (&current_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 (&current_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 ();
   skip_member ();

-
-  if (multi_volume_option)
-    assign_string (&save_name, 0);

 }
 
 /* Check header checksum */
 }
 
 /* Check header checksum */


@@ -322,8 +279,8 @@ tar_checksum (union block *header, bool silent)
 }
 
 /* Read a block that's supposed to be a header block.  Return its
 }
 
 /* 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).
 
    Return 1 for success, 0 if the checksum is bad, EOF on eof, 2 for a
    block full of zeros (EOF marker).


@@ -335,7 +292,7 @@ tar_checksum (union block *header, bool silent)
    the header which this routine reads.  */
 
 enum read_header
    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;
 {
   union block *header;
   union block *header_copy;


@@ -362,28 +319,28 @@ read_header (bool raw_extended_headers)
       /* Good block.  Decode file size and return.  */
 
       if (header->header.typeflag == LNKTYPE)
       /* 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
       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
          || header->header.typeflag == XHDTYPE
 
       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;
          else if (header->header.typeflag == GNUTYPE_LONGNAME
                   || header->header.typeflag == GNUTYPE_LONGLINK)
            {
        {
          if (raw_extended_headers)
            return HEADER_SUCCESS_EXTENDED;
          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;
 
              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);
                xalloc_die ();
 
              header_copy = xmalloc (size + 1);


@@ -427,12 +384,18 @@ read_header (bool raw_extended_headers)
 
              *bp = '\0';
            }
 
              *bp = '\0';
            }

-         else if (header->header.typeflag == XHDTYPE)
-           xheader_read (header, OFF_FROM_HEADER (header->header.size));
+         else if (header->header.typeflag == XHDTYPE
+                  || header->header.typeflag == SOLARIS_XHDTYPE)
+           xheader_read (&info->xhdr, header,
+                         OFF_FROM_HEADER (header->header.size));

          else if (header->header.typeflag == XGLTYPE)
            {
          else if (header->header.typeflag == XGLTYPE)
            {

-             xheader_read (header, OFF_FROM_HEADER (header->header.size));
-             xheader_decode_global ();
+             struct xheader xhdr;
+             memset (&xhdr, 0, sizeof xhdr);
+             xheader_read (&xhdr, header,
+                           OFF_FROM_HEADER (header->header.size));
+             xheader_decode_global (&xhdr);
+             xheader_destroy (&xhdr);

            }
 
          /* Loop!  */
            }
 
          /* Loop!  */


@@ -472,9 +435,9 @@ read_header (bool raw_extended_headers)
              recent_long_name = 0;
              recent_long_name_blocks = 0;
            }
              recent_long_name = 0;
              recent_long_name_blocks = 0;
            }

-         assign_string (&current_stat_info.orig_file_name, name);
-         assign_string (&current_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);
 
          if (recent_long_link)
            free (recent_long_link);


@@ -493,13 +456,60 @@ read_header (bool raw_extended_headers)
              recent_long_link = 0;
              recent_long_link_blocks = 0;
            }
              recent_long_link = 0;
              recent_long_link_blocks = 0;
            }

-         assign_string (&current_stat_info.link_name, name);
+         assign_string (&info->link_name, name);

 
          return HEADER_SUCCESS;
        }
     }
 }
 
 
          return HEADER_SUCCESS;
        }
     }
 }
 

+enum read_header
+read_header (bool raw_extended_headers)
+{
+  return read_header_primitive (raw_extended_headers, &current_stat_info);
+}
+
+static char *
+decode_xform (char *file_name, void *data)
+{
+  xform_type type = *(xform_type*)data;
+
+  switch (type)
+    {
+    case xform_symlink:
+      /* FIXME: It is not quite clear how and to which extent are the symbolic
+        links subject to filename transformation.  In the absence of another
+        solution, symbolic links are exempt from component stripping and
+        name suffix normalization, but subject to filename transformation
+        proper. */ 
+      return file_name;
+      
+    case xform_link:
+      file_name = safer_name_suffix (file_name, true, absolute_names_option);
+      break;
+      
+    case xform_regfile:
+      file_name = safer_name_suffix (file_name, false, absolute_names_option);
+      break;
+    }
+  
+  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;
+}
+
+bool
+transform_member_name (char **pinput, xform_type type)
+{
+  return transform_name_fp (pinput, decode_xform, &type);
+}
+

 #define ISOCTAL(c) ((c)>='0'&&(c)<='7')
 
 /* Decode things from a file HEADER block into STAT_INFO, also setting
 #define ISOCTAL(c) ((c)>='0'&&(c)<='7')
 
 /* Decode things from a file HEADER block into STAT_INFO, also setting


@@ -529,7 +539,7 @@ decode_header (union block *header, struct tar_stat_info *stat_info,
          && ISOCTAL (header->star_header.ctime[0])
          && header->star_header.ctime[11] == ' ')
        format = STAR_FORMAT;
          && ISOCTAL (header->star_header.ctime[0])
          && header->star_header.ctime[11] == ' ')
        format = STAR_FORMAT;

-      else if (extended_header.size)
+      else if (stat_info->xhdr.size)

        format = POSIX_FORMAT;
       else
        format = USTAR_FORMAT;
        format = POSIX_FORMAT;
       else
        format = USTAR_FORMAT;


@@ -541,22 +551,27 @@ 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);
   *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);
+  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,
                 header->header.gname[0] ? header->header.gname : NULL);
   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)
     {
 
   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);
+      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)
+    {
+      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
+    stat_info->atime = stat_info->ctime = start_time;

 
   if (format == V7_FORMAT)
     {
 
   if (format == V7_FORMAT)
     {


@@ -566,13 +581,6 @@ decode_header (union block *header, struct tar_stat_info *stat_info,
     }
   else
     {
     }
   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 (do_user_group)
        {
          /* FIXME: Decide if this should somewhat depend on -p.  */


@@ -592,8 +600,9 @@ decode_header (union block *header, struct tar_stat_info *stat_info,
        {
        case BLKTYPE:
        case CHRTYPE:
        {
        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:
          break;
 
        default:


@@ -610,7 +619,16 @@ decode_header (union block *header, struct tar_stat_info *stat_info,
       stat_info->is_sparse = true;
     }
   else
       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_member_name (&stat_info->file_name, xform_regfile);

 }
 
 /* Convert buffer at WHERE0 of size DIGS from external format to
 }
 
 /* Convert buffer at WHERE0 of size DIGS from external format to


@@ -918,61 +936,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
 /* 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 *
 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,
   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;
 
   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)
     {
   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;
     }
       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
 
   /* 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 = '-';
     *--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 = ' ';
     *--p = ' ';

+  if (full_time)
+    code_ns_fraction (ns, buffer + sizeof buffer - 1 - fraclen);

   return p;
 }
 
   return p;
 }
 


@@ -989,24 +1007,25 @@ 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..  */
 
 /* 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;
 
 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;
+  int time_stamp_len;
+  char *temp_name;

 
   /* These hold formatted ints.  */
   char uform[UINTMAX_STRSIZE_BOUND], gform[UINTMAX_STRSIZE_BOUND];
 
   /* These hold formatted ints.  */
   char uform[UINTMAX_STRSIZE_BOUND], gform[UINTMAX_STRSIZE_BOUND];


@@ -1015,6 +1034,15 @@ print_header (struct tar_stat_info *st, off_t block_ordinal)
                                /* holds formatted size or major,minor */
   char uintbuf[UINTMAX_STRSIZE_BOUND];
   int pad;
                                /* holds formatted size or major,minor */
   char uintbuf[UINTMAX_STRSIZE_BOUND];
   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)
     {
 
   if (block_number_option)
     {


@@ -1047,10 +1075,6 @@ print_header (struct tar_stat_info *st, off_t block_ordinal)
          modes[0] = 'M';
          break;
 
          modes[0] = 'M';
          break;
 

-       case GNUTYPE_NAMES:
-         modes[0] = 'N';
-         break;
-

        case GNUTYPE_LONGNAME:
        case GNUTYPE_LONGLINK:
          modes[0] = 'L';
        case GNUTYPE_LONGNAME:
        case GNUTYPE_LONGLINK:
          modes[0] = 'L';


@@ -1090,11 +1114,14 @@ print_header (struct tar_stat_info *st, off_t block_ordinal)
          break;
        }
 
          break;
        }
 

-      decode_mode (st->stat.st_mode, modes + 1);
+      pax_decode_mode (st->stat.st_mode, modes + 1);

 
       /* Time stamp.  */
 
 
       /* Time stamp.  */
 

-      time_stamp = tartime (st->stat.st_mtime);
+      time_stamp = tartime (st->mtime, false);
+      time_stamp_len = strlen (time_stamp);
+      if (datewidth < time_stamp_len)
+       datewidth = time_stamp_len;

 
       /* User and group names.  */
 
 
       /* User and group names.  */
 


@@ -1169,12 +1196,14 @@ print_header (struct tar_stat_info *st, off_t block_ordinal)
 
       /* Figure out padding and print the whole line.  */
 
 
       /* 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;
 
       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));
 
 
       fprintf (stdlis, " %s", quotearg (temp_name));
 


@@ -1229,10 +1258,6 @@ print_header (struct tar_stat_info *st, off_t block_ordinal)
                   uintbuf));
          fprintf (stdlis, _("--Continued at byte %s--\n"), size);
          break;
                   uintbuf));
          fprintf (stdlis, _("--Continued at byte %s--\n"), size);
          break;

-
-       case GNUTYPE_NAMES:
-         fprintf (stdlis, _("--Mangled file names--\n"));
-         break;

        }
     }
   fflush (stdlis);
        }
     }
   fflush (stdlis);


@@ -1249,7 +1274,7 @@ print_for_mkdir (char *dirname, int length, mode_t mode)
       /* File type and modes.  */
 
       modes[0] = 'd';
       /* File type and modes.  */
 
       modes[0] = 'd';

-      decode_mode (mode, modes + 1);
+      pax_decode_mode (mode, modes + 1);

 
       if (block_number_option)
        {
 
       if (block_number_option)
        {


@@ -1258,7 +1283,7 @@ print_for_mkdir (char *dirname, int length, mode_t mode)
                   STRINGIFY_BIGINT (current_block_ordinal (), buf));
        }
 
                   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));
     }
 }
               _("Creating directory:"), length, quotearg (dirname));
     }
 }


@@ -1269,25 +1294,19 @@ skip_file (off_t size)
 {
   union block *x;
 
 {
   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)
 
   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;
     }
 
       else
        seekable_archive = false;
     }
 

+  mv_size_left (size);
+

   while (size > 0)
     {
       x = find_next_block ();
   while (size > 0)
     {
       x = find_next_block ();


@@ -1296,8 +1315,7 @@ skip_file (off_t size)
 
       set_next_block_after (x);
       size -= BLOCKSIZE;
 
       set_next_block_after (x);
       size -= BLOCKSIZE;

-      if (multi_volume_option)
-       save_sizeleft -= BLOCKSIZE;
+      mv_size_left (size);

     }
 }
 
     }
 }
 


@@ -1306,13 +1324,18 @@ skip_file (off_t size)
 void
 skip_member (void)
 {
 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 (&current_stat_info);

 
 

-  if (current_stat_info.is_sparse)
-    sparse_skip_file (&current_stat_info);
-  else if (save_typeflag != DIRTYPE)
-    skip_file (current_stat_info.stat.st_size);
+      if (current_stat_info.is_sparse)
+       sparse_skip_file (&current_stat_info);
+      else if (save_typeflag != DIRTYPE)
+       skip_file (current_stat_info.stat.st_size);
+
+      mv_end ();
+    }

 }
 }