tar: change interdir_made from int to bool

[chaz/tar] / src / list.c

diff --git a/src/list.c b/src/list.c
index 3394e90d30d8896f7544e233c7a9455aaacccd76..9184beab739f70631c371a517b0c119af001e781 100644 (file)
--- a/src/list.c
+++ b/src/list.c
@@ -78,7 +78,8 @@ read_and (void (*do_something) (void))
       prev_status = status;
       tar_stat_destroy (&current_stat_info);
 
       prev_status = status;
       tar_stat_destroy (&current_stat_info);
 

-      status = read_header (&current_header, &current_stat_info, false);
+      status = read_header (&current_header, &current_stat_info,
+                            read_header_auto);

       switch (status)
        {
        case HEADER_STILL_UNREAD:
       switch (status)
        {
        case HEADER_STILL_UNREAD:


@@ -89,7 +90,8 @@ read_and (void (*do_something) (void))
 
          /* Valid header.  We should decode next field (mode) first.
             Ensure incoming names are null terminated.  */
 
          /* Valid header.  We should decode next field (mode) first.
             Ensure incoming names are null terminated.  */

-
+         decode_header (current_header, &current_stat_info,
+                        &current_format, 1);

          if (! name_match (current_stat_info.file_name)
              || (NEWER_OPTION_INITIALIZED (newer_mtime_option)
                  /* FIXME: We get mtime now, and again later; this causes
          if (! name_match (current_stat_info.file_name)
              || (NEWER_OPTION_INITIALIZED (newer_mtime_option)
                  /* FIXME: We get mtime now, and again later; this causes


@@ -115,8 +117,6 @@ read_and (void (*do_something) (void))
                           quotearg_colon (current_stat_info.file_name)));
                  /* Fall through.  */
                default:
                           quotearg_colon (current_stat_info.file_name)));
                  /* Fall through.  */
                default:

-                 decode_header (current_header,
-                                &current_stat_info, &current_format, 0);

                  skip_member ();
                  continue;
                }
                  skip_member ();
                  continue;
                }


@@ -139,7 +139,8 @@ read_and (void (*do_something) (void))
            {
              char buf[UINTMAX_STRSIZE_BOUND];
 
            {
              char buf[UINTMAX_STRSIZE_BOUND];
 

-             status = read_header (&current_header, &current_stat_info, false);
+             status = read_header (&current_header, &current_stat_info,
+                                   read_header_auto);

              if (status == HEADER_ZERO_BLOCK)
                break;
              WARNOPT (WARN_ALONE_ZERO_BLOCK,
              if (status == HEADER_ZERO_BLOCK)
                break;
              WARNOPT (WARN_ALONE_ZERO_BLOCK,


@@ -208,8 +209,6 @@ list_archive (void)
   off_t block_ordinal = current_block_ordinal ();
 
   /* Print the header block.  */
   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_header (&current_stat_info, current_header, block_ordinal);
 
   if (verbose_option)
     print_header (&current_stat_info, current_header, block_ordinal);
 


@@ -282,21 +281,29 @@ 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
-   and names (file name, link name) in *info.
+   address in *RETURN_BLOCK, and if it is good, the file's size
+   and names (file name, link name) in *INFO.
+
+   Return one of enum read_header describing the status of the
+   operation.

 
 

-   Return 1 for success, 0 if the checksum is bad, EOF on eof, 2 for a
-   block full of zeros (EOF marker).
+   The MODE parameter instructs read_header what to do with special
+   header blocks, i.e.: extended POSIX, GNU long name or long link,
+   etc.:

 
 

-   If RAW_EXTENDED_HEADERS is nonzero, do not automagically fold the
-   GNU long name and link headers into later headers.
+     read_header_auto        process them automatically,
+     read_header_x_raw       when a special header is read, return
+                             HEADER_SUCCESS_EXTENDED without actually
+                            processing the header,
+     read_header_x_global    when a POSIX global header is read,
+                             decode it and return HEADER_SUCCESS_EXTENDED.

 
 

-   You must always set_next_block_after(current_header) to skip past
+   You must always set_next_block_after(*return_block) to skip past

    the header which this routine reads.  */
 
 enum read_header
 read_header (union block **return_block, struct tar_stat_info *info,
    the header which this routine reads.  */
 
 enum read_header
 read_header (union block **return_block, struct tar_stat_info *info,

-            bool raw_extended_headers)
+            enum read_header_mode mode)

 {
   union block *header;
   union block *header_copy;
 {
   union block *header;
   union block *header_copy;


@@ -333,7 +340,7 @@ read_header (union block **return_block, struct tar_stat_info *info,
          || header->header.typeflag == XGLTYPE
          || header->header.typeflag == SOLARIS_XHDTYPE)
        {
          || header->header.typeflag == XGLTYPE
          || header->header.typeflag == SOLARIS_XHDTYPE)
        {

-         if (raw_extended_headers)
+         if (mode == read_header_x_raw)

            return HEADER_SUCCESS_EXTENDED;
          else if (header->header.typeflag == GNUTYPE_LONGNAME
                   || header->header.typeflag == GNUTYPE_LONGLINK)
            return HEADER_SUCCESS_EXTENDED;
          else if (header->header.typeflag == GNUTYPE_LONGNAME
                   || header->header.typeflag == GNUTYPE_LONGLINK)


@@ -405,6 +412,8 @@ read_header (union block **return_block, struct tar_stat_info *info,
                            OFF_FROM_HEADER (header->header.size));
              xheader_decode_global (&xhdr);
              xheader_destroy (&xhdr);
                            OFF_FROM_HEADER (header->header.size));
              xheader_decode_global (&xhdr);
              xheader_destroy (&xhdr);

+             if (mode == read_header_x_global)
+               return HEADER_SUCCESS_EXTENDED;

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


@@ -484,18 +493,18 @@ decode_xform (char *file_name, void *data)
         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
         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. */ 
+        proper. */

       return file_name;
       return file_name;

-      
+

     case XFORM_LINK:
       file_name = safer_name_suffix (file_name, true, absolute_names_option);
       break;
     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;
     }
     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,
   if (strip_name_components)
     {
       size_t prefix_len = stripped_prefix_len (file_name,


@@ -535,7 +544,7 @@ decode_header (union block *header, struct tar_stat_info *stat_info,
   enum archive_format format;
   unsigned hbits; /* high bits of the file mode. */
   mode_t mode = MODE_FROM_HEADER (header->header.mode, &hbits);
   enum archive_format format;
   unsigned hbits; /* high bits of the file mode. */
   mode_t mode = MODE_FROM_HEADER (header->header.mode, &hbits);

-  
+

   if (strcmp (header->header.magic, TMAGIC) == 0)
     {
       if (header->star_header.prefix[130] == 0
   if (strcmp (header->header.magic, TMAGIC) == 0)
     {
       if (header->star_header.prefix[130] == 0


@@ -639,7 +648,7 @@ decode_header (union block *header, struct tar_stat_info *stat_info,
     case SYMTYPE:
       transform_member_name (&stat_info->link_name, XFORM_SYMLINK);
       break;
     case SYMTYPE:
       transform_member_name (&stat_info->link_name, XFORM_SYMLINK);
       break;

-      
+

     case LNKTYPE:
       transform_member_name (&stat_info->link_name, XFORM_LINK);
     }
     case LNKTYPE:
       transform_member_name (&stat_info->link_name, XFORM_LINK);
     }


@@ -672,7 +681,8 @@ from_header (char const *where0, size_t digs, char const *type,
        {
          if (type && !silent)
            ERROR ((0, 0,
        {
          if (type && !silent)
            ERROR ((0, 0,

-                   /* TRANSLATORS: %s is type of the value (gid_t, uid_t, etc.) */
+                   /* TRANSLATORS: %s is type of the value (gid_t, uid_t,
+                      etc.) */

                    _("Blanks in header where numeric %s value expected"),
                    type));
          return -1;
                    _("Blanks in header where numeric %s value expected"),
                    type));
          return -1;


@@ -1053,9 +1063,6 @@ simple_print_header (struct tar_stat_info *st, union block *blk,
   int pad;
   int sizelen;
 
   int pad;
   int sizelen;
 

-  if (test_label_option && blk->header.typeflag != GNUTYPE_VOLHDR)
-    return;
-

   if (show_transformed_names_option)
     temp_name = st->file_name ? st->file_name : st->orig_file_name;
   else
   if (show_transformed_names_option)
     temp_name = st->file_name ? st->file_name : st->orig_file_name;
   else


@@ -1136,7 +1143,7 @@ simple_print_header (struct tar_stat_info *st, union block *blk,
 
       /* Time stamp.  */
 
 
       /* Time stamp.  */
 

-      time_stamp = tartime (st->mtime, false);
+      time_stamp = tartime (st->mtime, full_time_option);

       time_stamp_len = strlen (time_stamp);
       if (datewidth < time_stamp_len)
        datewidth = time_stamp_len;
       time_stamp_len = strlen (time_stamp);
       if (datewidth < time_stamp_len)
        datewidth = time_stamp_len;


@@ -1282,30 +1289,36 @@ simple_print_header (struct tar_stat_info *st, union block *blk,
 }
 
 
 }
 
 

+static void
+print_volume_label (void)
+{
+  struct tar_stat_info vstat;
+  union block vblk;
+  enum archive_format dummy;
+
+  memset (&vblk, 0, sizeof (vblk));
+  vblk.header.typeflag = GNUTYPE_VOLHDR;
+  if (recent_global_header)
+    memcpy (vblk.header.mtime, recent_global_header->header.mtime,
+           sizeof vblk.header.mtime);
+  tar_stat_init (&vstat);
+  assign_string (&vstat.file_name, ".");
+  decode_header (&vblk, &vstat, &dummy, 0);
+  assign_string (&vstat.file_name, volume_label);
+  simple_print_header (&vstat, &vblk, 0);
+  tar_stat_destroy (&vstat);
+}
+

 void
 print_header (struct tar_stat_info *st, union block *blk,
              off_t block_ordinal)
 {
   if (current_format == POSIX_FORMAT && !volume_label_printed && volume_label)
     {
 void
 print_header (struct tar_stat_info *st, union block *blk,
              off_t block_ordinal)
 {
   if (current_format == POSIX_FORMAT && !volume_label_printed && volume_label)
     {

-      struct tar_stat_info vstat;
-      union block vblk;
-      enum archive_format dummy;
-
+      print_volume_label ();

       volume_label_printed = true;
       volume_label_printed = true;

-
-      memset (&vblk, 0, sizeof (vblk));
-      vblk.header.typeflag = GNUTYPE_VOLHDR;
-      if (recent_global_header)
-       memcpy (vblk.header.mtime, recent_global_header->header.mtime,
-               sizeof vblk.header.mtime);
-      tar_stat_init (&vstat);
-      assign_string (&vstat.file_name, ".");
-      decode_header (&vblk, &vstat, &dummy, 0);
-      assign_string (&vstat.file_name, volume_label);
-      simple_print_header (&vstat, &vblk, block_ordinal);
-      tar_stat_destroy (&vstat);

     }
     }

+

   simple_print_header (st, blk, block_ordinal);
 }
 
   simple_print_header (st, blk, block_ordinal);
 }
 


@@ -1340,7 +1353,7 @@ skip_file (off_t size)
 {
   union block *x;
 
 {
   union block *x;
 

-  /* FIXME: Make sure mv_begin is always called before it */
+  /* FIXME: Make sure mv_begin_read is always called before it */

 
   if (seekable_archive)
     {
 
   if (seekable_archive)
     {


@@ -1375,7 +1388,7 @@ skip_member (void)
       char save_typeflag = current_header->header.typeflag;
       set_next_block_after (current_header);
 
       char save_typeflag = current_header->header.typeflag;
       set_next_block_after (current_header);
 

-      mv_begin (&current_stat_info);
+      mv_begin_read (&current_stat_info);

 
       if (current_stat_info.is_sparse)
        sparse_skip_file (&current_stat_info);
 
       if (current_stat_info.is_sparse)
        sparse_skip_file (&current_stat_info);


@@ -1385,3 +1398,34 @@ skip_member (void)
       mv_end ();
     }
 }
       mv_end ();
     }
 }

+
+void
+test_archive_label ()
+{
+  base64_init ();
+  name_gather ();
+
+  open_archive (ACCESS_READ);
+  if (read_header (&current_header, &current_stat_info, read_header_auto)
+      == HEADER_SUCCESS)
+    {
+      decode_header (current_header,
+                    &current_stat_info, &current_format, 0);
+      if (current_header->header.typeflag == GNUTYPE_VOLHDR)
+       assign_string (&volume_label, current_header->header.name);
+
+      if (volume_label)
+       {
+         if (verbose_option)
+           print_volume_label ();
+         if (!name_match (volume_label) && multi_volume_option)
+           {
+             char *s = drop_volume_label_suffix (volume_label);
+             name_match (s);
+             free (s);
+           }
+       }
+    }
+  close_archive ();
+  label_notfound ();
+}