Minor fix.

[chaz/tar] / src / list.c

diff --git a/src/list.c b/src/list.c
index 716c0b4230a3e50c07dc7ec98afbf6d6aa56381f..dad725a82f35a6040e799aece139d765c99fc1b2 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)
        {


@@ -140,7 +140,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,7 +210,7 @@ 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);
   decode_header (current_header, &current_stat_info, &current_format, 0);
   if (verbose_option)
     print_header (&current_stat_info, current_header, block_ordinal);


@@ -496,18 +496,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 +547,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 +651,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 +1146,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 +1292,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;


@@ -1412,22 +1412,23 @@ test_archive_label ()
   if (read_header (&current_header, &current_stat_info, read_header_auto)
       == HEADER_SUCCESS)
     {
   if (read_header (&current_header, &current_stat_info, read_header_auto)
       == HEADER_SUCCESS)
     {

-      char *s = NULL;
-       

       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);
 
       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
-         && (name_match (volume_label)
-             || (multi_volume_option
-                 && (s = drop_volume_label_suffix (volume_label))
-                 && name_match (s))))
-       if (verbose_option)
-         print_volume_label ();
-      free (s);
+      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 ();
     }
   close_archive ();

-  names_notfound ();
+  label_notfound ();

 }
 }