tar: change interdir_made from int to bool

[chaz/tar] / src / list.c

diff --git a/src/list.c b/src/list.c
index 0474fb1e5ad40a02cab4f5c76f076ed7e1e9ffc3..9184beab739f70631c371a517b0c119af001e781 100644 (file)
--- a/src/list.c
+++ b/src/list.c
@@ -78,7 +78,7 @@ 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, 
+      status = read_header (&current_header, &current_stat_info,

                             read_header_auto);
       switch (status)
        {
                             read_header_auto);
       switch (status)
        {


@@ -90,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


@@ -116,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;
                }


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

-             status = read_header (&current_header, &current_stat_info, 
+             status = read_header (&current_header, &current_stat_info,

                                    read_header_auto);
              if (status == HEADER_ZERO_BLOCK)
                break;
                                    read_header_auto);
              if (status == HEADER_ZERO_BLOCK)
                break;


@@ -210,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);
 


@@ -496,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,


@@ -547,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


@@ -651,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);
     }


@@ -1146,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;


@@ -1292,8 +1289,8 @@ simple_print_header (struct tar_stat_info *st, union block *blk,
 }
 
 
 }
 
 

-void
-print_volume_label ()
+static void
+print_volume_label (void)

 {
   struct tar_stat_info vstat;
   union block vblk;
 {
   struct tar_stat_info vstat;
   union block vblk;


@@ -1356,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)
     {


@@ -1391,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);


@@ -1416,7 +1413,7 @@ test_archive_label ()
                     &current_stat_info, &current_format, 0);
       if (current_header->header.typeflag == GNUTYPE_VOLHDR)
        assign_string (&volume_label, current_header->header.name);
                     &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)
       if (volume_label)
        {
          if (verbose_option)