allow restoring of atimes

Author: miekg

ChangeLog

@@ -1,12 +1,15 @@
 09 Aug 2009: 1.1.0-dev0 Miek <[email protected]>
     * Format change: add username, groupname and mtime
-      Always output the files' contents
+      _Always_ output the files' contents
       %U username
       %G groupname
       %t is mtime of the fs object
     * Adapt all utils to this format change
 	- rdup now handles -P itself
 	- rdup-tr does not do -P anymore
+	- rdup is the only tool that accesses the files
+	- rdup-tr only processes from stdin to stdout
+	- rdup-up only processes stdin
     * Loads of code cleanups
     * Use OpenSSL in favor of libnettle
     * Change default install path /usr/local (Sebastian Kügler)

common.c

@@ -21,6 +21,7 @@ entry_dup(struct rdup *f)
         g->f_mode       = f->f_mode;
 	g->f_ctime      = f->f_ctime;
 	g->f_mtime      = f->f_mtime;
+	g->f_atime      = f->f_atime;
 	g->f_size       = f->f_size;
 	g->f_dev        = f->f_dev;
 	g->f_rdev       = f->f_rdev;

crawler.c

@@ -8,6 +8,7 @@
 
 extern gboolean opt_onefilesystem;
 extern gboolean opt_nobackup;
+extern gboolean opt_atime;
 extern time_t opt_timestamp;
 extern gint opt_verbose;
 extern GSList *pregex_list;
@@ -54,6 +55,7 @@ dir_prepend(GTree *t, char *path, GHashTable *u, GHashTable *g)
 		e.f_group     = lookup_group(g, e.f_gid);
 		e.f_ctime     = s.st_ctime;
 		e.f_mtime     = s.st_mtime;
+		e.f_atime     = s.st_atime;
 		e.f_mode      = s.st_mode;
 		e.f_size      = s.st_size;
 		e.f_dev       = s.st_dev;
@@ -120,6 +122,16 @@ dir_crawl(GTree *t, GHashTable *linkhash, GHashTable *userhash,
 	current_dev = s.st_dev;
 
 	while((dent = readdir(dir))) {
+		if (opt_atime) {
+			struct utimbuf ut;
+			ut.actime  = s.st_atime;
+			ut.modtime = s.st_mtime;
+			/* BUGBUG */
+			fprintf(stderr, "Resetting access\n");
+                        if (utime(path, &ut) == -1) 
+                                msg(_("Failed to reset atime: '%s\': %s"), path, strerror(errno));
+		}
+
 		if (!strcmp(dent->d_name, ".") || 
 				!strcmp(dent->d_name, ".."))
 			continue;
@@ -157,6 +169,7 @@ dir_crawl(GTree *t, GHashTable *linkhash, GHashTable *userhash,
 			pop.f_group     = lookup_group(grouphash, pop.f_gid);
 			pop.f_ctime     = s.st_ctime;
 			pop.f_mtime     = s.st_mtime;
+			pop.f_atime     = s.st_atime;
 			pop.f_mode      = s.st_mode;
 			pop.f_size      = s.st_size;
 			pop.f_dev       = s.st_dev;
@@ -234,6 +247,7 @@ dir_crawl(GTree *t, GHashTable *linkhash, GHashTable *userhash,
 			dirstack[d]->f_group      = lookup_group(grouphash, s.st_gid);
 			dirstack[d]->f_ctime      = s.st_ctime;
 			dirstack[d]->f_mtime      = s.st_mtime;
+			dirstack[d]->f_atime      = s.st_atime;
 			dirstack[d]->f_mode       = s.st_mode;
 			dirstack[d]->f_size       = s.st_size;
 			dirstack[d]->f_dev        = s.st_dev;

doc/rdup.1.in

@@ -166,6 +166,8 @@ trailing slash.
 .RE
 
 .TP
+.B \-a
+Restore the original access times on the files and directories.
 .B \-c
 Force output to the tty. Normally \fBrdup-tr\fR wants to see it's
 output redirected.

entry.c

@@ -59,6 +59,7 @@ parse_entry(char *buf, size_t l)
 			e->f_lnk       = 0;
 			e->f_ctime     = s->st_ctime;
 			e->f_mtime     = s->st_mtime;
+			e->f_atime     = s->st_atime;
 
 			/* you will loose hardlink information here 
 			 * as 'stat' cannot check this */
@@ -306,7 +307,7 @@ stat_from_rdup(struct rdup *e)
 	s->st_rdev     = e->f_rdev;
 	s->st_ctime    = e->f_ctime;
 	s->st_mtime    = e->f_mtime;
-	s->st_atime    = 0;
+	s->st_atime    = e->f_atime;
 
 	/*
 	struct stat {

entry.h

@@ -18,6 +18,7 @@ struct rdup {
         mode_t f_mode;		/* mode bits */
         time_t f_ctime;		/* change time of the inode */
         time_t f_mtime;		/* modification time of the inode */
+        time_t f_atime;		/* modification time of the inode */
         off_t f_size;		/* file size */
 	dev_t f_dev;		/* ID of device containing file */
 	dev_t f_rdev;		/* device ID (if special file), we use this for major, minor */

fs-up.c

@@ -25,7 +25,7 @@ static gboolean
 mk_time(struct rdup *e)
 {
 	struct utimbuf ut;
-	/* don't carry the a_time, how cares anyway with noatime? */
+	/* we don't carry the a_time, how cares anyway with noatime? */
 	ut.actime = ut.modtime = e->f_mtime;
 
 	if (utime(e->f_name, &ut) == -1) 

gfunc.c

@@ -12,6 +12,7 @@
 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;
@@ -150,10 +151,17 @@ 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;
 	}
 }

rdup.c

@@ -203,6 +203,7 @@ g_tree_read_file(FILE *fp)
 		e->f_gid       = 0;	/* keep this 0 for now */
 		e->f_ctime     = 0;
 		e->f_mtime     = 0;
+		e->f_atime     = 0;
 		e->f_user      = NULL;
 		e->f_group     = NULL;
 		e->f_dev       = f_dev;