Avoid installation glitches on Solaris 8 with Sun C 5.4.

[chaz/tar] / src / compare.c

diff --git a/src/compare.c b/src/compare.c
index 02240aa3bf953797e926ce920e181b1e888b8b4b..9bcb260aa13e3bec502c9f82bf0607b0d6c03fb5 100644 (file)
--- a/src/compare.c
+++ b/src/compare.c
@@ -1,7 +1,7 @@
 /* Diff files from a tar archive.
 
    Copyright (C) 1988, 1992, 1993, 1994, 1996, 1997, 1999, 2000, 2001,
-   2003, 2004, 2005 Free Software Foundation, Inc.
+   2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 
    Written by John Gilmore, on 1987-04-30.
 
@@ -20,15 +20,14 @@
    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #include <system.h>
+#include <system-ioctl.h>
 
 #if HAVE_LINUX_FD_H
 # include <linux/fd.h>
 #endif
 
-#include <quotearg.h>
-#include <utimens.h>
-
 #include "common.h"
+#include <quotearg.h>
 #include <rmt.h>
 #include <stdarg.h>
 
@@ -134,14 +133,15 @@ process_dumpdir (size_t bytes, char *buffer)
    address of the chunk it can work with.  The PROCESSOR should return
    nonzero for success.  It it return error once, continue skipping
    without calling PROCESSOR anymore.  */
+
 static void
-read_and_process (off_t size, int (*processor) (size_t, char *))
+read_and_process (struct tar_stat_info *st, int (*processor) (size_t, char *))
 {
   union block *data_block;
   size_t data_size;
+  size_t size = st->stat.st_size;
 
-  if (multi_volume_option)
-    save_sizeleft = size;
+  mv_begin (st);
   while (size)
     {
       data_block = find_next_block ();
@@ -159,9 +159,9 @@ read_and_process (off_t size, int (*processor) (size_t, char *))
       set_next_block_after ((union block *)
                            (data_block->buffer + data_size - 1));
       size -= data_size;
-      if (multi_volume_option)
-       save_sizeleft -= data_size;
+      mv_size_left (size);
     }
+  mv_end ();
 }
 
 /* Call either stat or lstat over STAT_DATA, depending on
@@ -204,9 +204,10 @@ diff_dir (void)
 static void
 diff_file (void)
 {
+  char const *file_name = current_stat_info.file_name;
   struct stat stat_data;
 
-  if (!get_stat_data (current_stat_info.file_name, &stat_data))
+  if (!get_stat_data (file_name, &stat_data))
     skip_member ();
   else if (!S_ISREG (stat_data.st_mode))
     {
@@ -224,21 +225,27 @@ diff_file (void)
       if (!sys_compare_gid (&stat_data, &current_stat_info.stat))
        report_difference (&current_stat_info, _("Gid differs"));
 
-      if (timespec_cmp (get_stat_mtime (&stat_data), current_stat_info.mtime))
+      if (tar_timespec_cmp (get_stat_mtime (&stat_data),
+                            current_stat_info.mtime))
        report_difference (&current_stat_info, _("Mod time differs"));
-      if (current_header->header.typeflag != GNUTYPE_SPARSE &&
-         stat_data.st_size != current_stat_info.stat.st_size)
+      if (current_header->header.typeflag != GNUTYPE_SPARSE
+         && stat_data.st_size != current_stat_info.stat.st_size)
        {
          report_difference (&current_stat_info, _("Size differs"));
          skip_member ();
        }
       else
        {
-         diff_handle = open (current_stat_info.file_name, O_RDONLY | O_BINARY);
+         int atime_flag =
+           (atime_preserve_option == system_atime_preserve
+            ? O_NOATIME
+            : 0);
+
+         diff_handle = open (file_name, O_RDONLY | O_BINARY | atime_flag);
 
          if (diff_handle < 0)
            {
-             open_error (current_stat_info.file_name);
+             open_error (file_name);
              skip_member ();
              report_difference (&current_stat_info, NULL);
            }
@@ -249,34 +256,20 @@ diff_file (void)
              if (current_stat_info.is_sparse)
                sparse_diff_file (diff_handle, &current_stat_info);
              else
-               {
-                 if (multi_volume_option)
-                   {
-                     assign_string (&save_name,
-                                     current_stat_info.orig_file_name);
-                     save_totsize = current_stat_info.stat.st_size;
-                     /* save_sizeleft is set in read_and_process.  */
-                   }
-
-                 read_and_process (current_stat_info.stat.st_size,
-                                   process_rawdata);
-
-                 if (multi_volume_option)
-                   assign_string (&save_name, 0);
-               }
-
-             status = close (diff_handle);
-             if (status != 0)
-               close_error (current_stat_info.file_name);
+               read_and_process (&current_stat_info, process_rawdata);
 
-             if (atime_preserve_option)
+             if (atime_preserve_option == replace_atime_preserve)
                {
                  struct timespec ts[2];
                  ts[0] = get_stat_atime (&stat_data);
                  ts[1] = get_stat_mtime (&stat_data);
-                 if (utimens (current_stat_info.file_name, ts) != 0)
-                   utime_error (current_stat_info.file_name);
+                 if (set_file_atime (diff_handle, file_name, ts) != 0)
+                   utime_error (file_name);
                }
+
+             status = close (diff_handle);
+             if (status != 0)
+               close_error (file_name);
            }
        }
     }
@@ -356,27 +349,30 @@ diff_special (void)
 static void
 diff_dumpdir (void)
 {
-  char *dumpdir_buffer = get_directory_contents (current_stat_info.file_name,
-                                                0);
+  char *dumpdir_buffer;
+  dev_t dev = 0;
+  struct stat stat;
 
-  if (multi_volume_option)
+  if (deref_stat (true, current_stat_info.file_name, &stat))
     {
-      assign_string (&save_name, current_stat_info.orig_file_name);
-      save_totsize = current_stat_info.stat.st_size;
-      /* save_sizeleft is set in read_and_process.  */
+      if (errno == ENOENT)
+       stat_warn (current_stat_info.file_name);
+      else
+       stat_error (current_stat_info.file_name);
     }
+  else
+    dev = stat.st_dev;
+
+  dumpdir_buffer = get_directory_contents (current_stat_info.file_name, dev);
 
   if (dumpdir_buffer)
     {
       dumpdir_cursor = dumpdir_buffer;
-      read_and_process (current_stat_info.stat.st_size, process_dumpdir);
+      read_and_process (&current_stat_info, process_dumpdir);
       free (dumpdir_buffer);
     }
   else
-    read_and_process (current_stat_info.stat.st_size, process_noop);
-
-  if (multi_volume_option)
-    assign_string (&save_name, 0);
+    read_and_process (&current_stat_info, process_noop);
 }
 
 static void
@@ -427,17 +423,7 @@ diff_multivol (void)
       return;
     }
 
-  if (multi_volume_option)
-    {
-      assign_string (&save_name, current_stat_info.orig_file_name);
-      save_totsize = stat_data.st_size;
-      /* save_sizeleft is set in read_and_process.  */
-    }
-
-  read_and_process (current_stat_info.stat.st_size, process_rawdata);
-
-  if (multi_volume_option)
-    assign_string (&save_name, 0);
+  read_and_process (&current_stat_info, process_rawdata);
 
   status = close (fd);
   if (status != 0)