X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fcompare.c;h=5445ac07257698c4cace1435d3bdf424969f85b0;hb=476019d08388d0db5c0cf1aeec5e8e32ebed073d;hp=0173363df18be998266ed6a3b906071096cac9f8;hpb=57c2124d68aa65843548feef9d226fb025503258;p=chaz%2Ftar

diff --git a/src/compare.c b/src/compare.c
index 0173363..5445ac0 100644
--- a/src/compare.c
+++ b/src/compare.c
@@ -25,10 +25,8 @@
 # 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 +132,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;
-
-  if (multi_volume_option)
-    save_sizeleft = size;
+  size_t size = st->stat.st_size;
+  
+  mv_begin (st);
   while (size)
     {
       data_block = find_next_block ();
@@ -159,9 +158,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 +203,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))
     {
@@ -227,19 +227,24 @@ diff_file (void)
       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);
 	    }
@@ -250,34 +255,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);
 	    }
 	}
     }
@@ -370,27 +361,17 @@ diff_dumpdir (void)
     }
   else
     dev = stat.st_dev;
-      
-  dumpdir_buffer = get_directory_contents (current_stat_info.file_name, dev);
 
-  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.  */
-    }
+  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
@@ -441,18 +422,8 @@ 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)
     close_error (current_stat_info.file_name);