Make the -a option a noop

Author: miekg

ChangeLog

@@ -4,6 +4,7 @@ xx Yyy 2013: 1.1.15 Miek Gieben <miek@miek.nl>
   * [rdup-tr] Fix crashes with filename encryption and symlinks (reported by
     Jakob Fink)
   * [rdup] Fix the linked list that tracks the child's PIDs.
+  * [rdup] Drop -a option, it's racy and must proper or not at all.
 
 19 Jan 2013: 1.1.14 Miek Gieben <miek@miek.nl>
    * [rdup] check for the existence of ._rdup_. files and parse its contents

crawler.c

@@ -8,7 +8,6 @@
 
 extern gboolean opt_onefilesystem;
 extern gboolean opt_nobackup;
-extern gboolean opt_atime;
 extern gboolean opt_chown;
 extern time_t opt_timestamp;
 extern gint opt_verbose;
@@ -304,17 +303,6 @@ dir_crawl(GTree * t, GHashTable * linkhash, GHashTable * userhash,
 		}
 	}
 	closedir(dir);
-	if (opt_atime) {
-		/* reset dirs atime */
-		if (d > 0 && opt_atime) {
-			struct utimbuf ut;
-			ut.actime = dirstack[d - 1]->f_atime;
-			ut.modtime = dirstack[d - 1]->f_mtime;
-			if (utime(dirstack[d - 1]->f_name, &ut) == -1)
-				msg(_("Failed to reset atime: '%s\': %s"),
-				    dirstack[d - 1]->f_name, strerror(errno));
-		}
-	}
 
 	while (d > 0) {
 		directory = dirstack[--d];

gfunc.c

@@ -17,7 +17,6 @@
 extern gboolean opt_removed;
 extern gboolean opt_modified;
 extern gboolean opt_skip;
-extern gboolean opt_atime;
 extern gint opt_verbose;
 extern char *opt_format;
 extern time_t opt_timestamp;
@@ -175,18 +174,10 @@ static gboolean cat(FILE * fp, char *filename)
  */
 static void entry_cat_data(FILE * fp, struct rdup *e)
 {
-	struct utimbuf ut;
-	ut.actime = e->f_atime;
-	ut.modtime = e->f_mtime;
-
 	if (S_ISREG(e->f_mode) && e->f_lnk == 0) {
 		if (!cat(fp, e->f_name))
 			exit(EXIT_FAILURE);
 
-		if (opt_atime)
-			if (utime(e->f_name, &ut) == -1)
-				msg(_("Failed to reset atime: '%s\': %s"),
-				    e->f_name, strerror(errno));
 		return;
 	}
 }
@@ -477,6 +468,7 @@ gfunc_backup(gpointer data, gpointer value,
 			return FALSE;
 		default:	/* INC_DUMP */
 			if (((struct rdup *)data)->f_ctime >= opt_timestamp) {
+                                fprintf(stderr, "%zd %zd\n", ((struct rdup *)data)->f_ctime, opt_timestamp); /* MIEK */
 				entry_print(stdout, PLUS, (struct rdup *)data,
 					    opt_format);
 #if DEBUG

rdup.c

@@ -319,13 +319,11 @@ int main(int argc, char **argv)
 			break;
 		case 'a':
 			opt_atime = TRUE;
-			/* when atime is true, every file is touched during the
-			 * backup (the c_time changes). To make rdup not see these
-			 * files as new in the backup, we must set the timestamp
-			 * file with a timestamp AFTER the backup.
-			 * If we do this we will not see file the are changed
-			 * DURING the backup...
-			 */
+                        /* -a creates race conditions that can be solved, but using
+                         * higher resolution timestamps, for now disbale this 
+                         * feature
+                         */
+                        msg(_("The option `-a\' is a noop"));
 			break;
 		case 'c':
 			opt_tty = TRUE;
@@ -498,8 +496,7 @@ int main(int argc, char **argv)
 			    stamp, strerror(errno));
 			exit(EXIT_FAILURE);
 		}
-		/* and set the time when rdup was started, only when -a was not given */
-		if (!opt_atime && utime(stamp, &ut) == -1) {
+		if (utime(stamp, &ut) == -1) {
 			msg(_("Failed to reset atime: '%s\': %s"), stamp,
 			    strerror(errno));
 			exit(EXIT_FAILURE);