1 After applying this patch and running configure, you MUST run this
7 --- orig/batch.c 2005-02-07 20:41:56
8 +++ batch.c 2004-07-03 20:15:41
9 @@ -206,6 +206,8 @@ void show_flist(int index, struct file_s
10 rprintf(FINFO, "flist->flags=%#x\n", fptr[i]->flags);
11 rprintf(FINFO, "flist->modtime=%#lx\n",
12 (long unsigned) fptr[i]->modtime);
13 + rprintf(FINFO, "flist->atime=%#lx\n",
14 + (long unsigned) fptr[i]->atime);
15 rprintf(FINFO, "flist->length=%.0f\n",
16 (double) fptr[i]->length);
17 rprintf(FINFO, "flist->mode=%#o\n", (int) fptr[i]->mode);
18 --- orig/flist.c 2005-02-14 02:45:10
19 +++ flist.c 2005-02-07 21:06:04
20 @@ -62,6 +62,7 @@ extern int make_backups;
21 extern int backup_suffix_len;
22 extern int copy_links;
23 extern int copy_unsafe_links;
24 +extern int copy_atimes;
25 extern int protocol_version;
26 extern int sanitize_paths;
27 extern int max_delete;
28 @@ -147,16 +148,18 @@ static void list_file_entry(struct file_
31 if (preserve_links && S_ISLNK(f->mode)) {
32 - rprintf(FINFO, "%s %11.0f %s %s -> %s\n",
33 + rprintf(FINFO, "%s %11.0f %s %s %s -> %s\n",
35 (double)f->length, timestring(f->modtime),
36 + timestring(f->atime),
37 safe_fname(f_name(f)), safe_fname(f->u.link));
41 - rprintf(FINFO, "%s %11.0f %s %s\n",
42 + rprintf(FINFO, "%s %11.0f %s %s %s\n",
44 (double)f->length, timestring(f->modtime),
45 + timestring(f->atime),
46 safe_fname(f_name(f)));
49 @@ -320,6 +323,7 @@ void send_file_entry(struct file_struct
52 static time_t modtime;
53 + static time_t atime;
57 @@ -335,7 +339,7 @@ void send_file_entry(struct file_struct
61 - modtime = 0, mode = 0;
62 + modtime = 0, atime = 0, mode = 0;
63 dev = 0, rdev = makedev(0, 0);
66 @@ -384,6 +388,12 @@ void send_file_entry(struct file_struct
67 flags |= XMIT_SAME_TIME;
69 modtime = file->modtime;
70 + if (copy_atimes && !S_ISDIR(mode)) {
71 + if (file->atime == atime)
72 + flags |= XMIT_SAME_ATIME;
74 + atime = file->atime;
77 #ifdef SUPPORT_HARD_LINKS
78 if (file->link_u.idev) {
79 @@ -439,6 +449,8 @@ void send_file_entry(struct file_struct
80 write_int(f, modtime);
81 if (!(flags & XMIT_SAME_MODE))
82 write_int(f, to_wire_mode(mode));
83 + if (copy_atimes && !S_ISDIR(mode) && !(flags & XMIT_SAME_ATIME))
84 + write_int(f, atime);
85 if (preserve_uid && !(flags & XMIT_SAME_UID)) {
88 @@ -512,6 +524,7 @@ static struct file_struct *receive_file_
89 unsigned short flags, int f)
91 static time_t modtime;
92 + static time_t atime;
96 @@ -530,7 +543,7 @@ static struct file_struct *receive_file_
97 struct file_struct *file;
100 - modtime = 0, mode = 0;
101 + modtime = 0, atime = 0, mode = 0;
102 dev = 0, rdev = makedev(0, 0);
105 @@ -586,6 +599,8 @@ static struct file_struct *receive_file_
106 modtime = (time_t)read_int(f);
107 if (!(flags & XMIT_SAME_MODE))
108 mode = from_wire_mode(read_int(f));
109 + if (copy_atimes && !S_ISDIR(mode) && !(flags & XMIT_SAME_ATIME))
110 + atime = (time_t)read_int(f);
112 if (preserve_uid && !(flags & XMIT_SAME_UID))
113 uid = (uid_t)read_int(f);
114 @@ -636,6 +651,7 @@ static struct file_struct *receive_file_
117 file->modtime = modtime;
118 + file->atime = atime;
119 file->length = file_length;
122 @@ -885,6 +901,7 @@ skip_filters:
125 file->modtime = st.st_mtime;
126 + file->atime = st.st_atime;
127 file->length = st.st_size;
128 file->mode = st.st_mode;
129 file->uid = st.st_uid;
130 --- orig/generator.c 2005-02-14 02:45:10
131 +++ generator.c 2004-11-03 23:02:12
132 @@ -100,7 +100,7 @@ static int unchanged_file(char *fn, stru
136 - return cmp_modtime(st->st_mtime, file->modtime) == 0;
137 + return cmp_time(st->st_mtime, file->modtime) == 0;
141 @@ -612,7 +612,7 @@ static void recv_generator(char *fname,
144 if (update_only && fnamecmp_type == FNAMECMP_FNAME
145 - && cmp_modtime(st.st_mtime, file->modtime) > 0) {
146 + && cmp_time(st.st_mtime, file->modtime) > 0) {
148 rprintf(FINFO, "%s is newer\n", safe_fname(fname));
150 --- orig/options.c 2005-02-14 02:45:10
151 +++ options.c 2005-01-24 01:51:48
152 @@ -50,6 +50,7 @@ int preserve_uid = 0;
153 int preserve_gid = 0;
154 int preserve_times = 0;
155 int omit_dir_times = 0;
156 +int copy_atimes = 0;
160 @@ -273,6 +274,7 @@ void usage(enum logcode F)
161 rprintf(F," -g, --group preserve group\n");
162 rprintf(F," -D, --devices preserve devices (root only)\n");
163 rprintf(F," -t, --times preserve times\n");
164 + rprintf(F," -A, --copy-atimes copy access times\n");
165 rprintf(F," -O, --omit-dir-times omit directories when preserving times\n");
166 rprintf(F," -S, --sparse handle sparse files efficiently\n");
167 rprintf(F," -n, --dry-run show what would have been transferred\n");
168 @@ -394,6 +396,7 @@ static struct poptOption long_options[]
169 {"devices", 'D', POPT_ARG_NONE, &preserve_devices, 0, 0, 0 },
170 {"times", 't', POPT_ARG_NONE, &preserve_times, 0, 0, 0 },
171 {"omit-dir-times", 'O', POPT_ARG_NONE, &omit_dir_times, 0, 0, 0 },
172 + {"copy-atimes", 'A', POPT_ARG_NONE, ©_atimes, 0, 0, 0 },
173 {"checksum", 'c', POPT_ARG_NONE, &always_checksum, 0, 0, 0 },
174 {"verbose", 'v', POPT_ARG_NONE, 0, 'v', 0, 0 },
175 {"quiet", 'q', POPT_ARG_NONE, 0, 'q', 0, 0 },
176 @@ -1214,6 +1217,8 @@ void server_options(char **args,int *arg
182 if (omit_dir_times && am_sender)
185 --- orig/rsync.c 2005-02-14 02:45:10
186 +++ rsync.c 2005-01-24 01:59:12
187 @@ -26,6 +26,7 @@ extern int verbose;
189 extern int preserve_times;
190 extern int omit_dir_times;
191 +extern int copy_atimes;
193 extern int am_server;
194 extern int am_sender;
195 @@ -156,6 +157,7 @@ int set_perms(char *fname,struct file_st
198 int change_uid, change_gid;
199 + time_t atime, mtime;
203 @@ -168,18 +170,28 @@ int set_perms(char *fname,struct file_st
207 + if (!copy_atimes || S_ISLNK(st->st_mode) || S_ISDIR(st->st_mode))
208 + flags |= PERMS_SKIP_ATIME;
209 if (!preserve_times || S_ISLNK(st->st_mode)
210 || (S_ISDIR(st->st_mode)
211 && (omit_dir_times || (make_backups && !backup_dir))))
212 flags |= PERMS_SKIP_MTIME;
213 + if (!(flags & PERMS_SKIP_ATIME)
214 + && cmp_time(st->st_atime, file->atime) != 0) {
215 + atime = file->atime;
218 + atime = st->st_atime;
219 if (!(flags & PERMS_SKIP_MTIME)
220 - && cmp_modtime(st->st_mtime, file->modtime) != 0) {
221 - if (set_modtime(fname,file->modtime) != 0) {
222 - rsyserr(FERROR, errno, "failed to set times on %s",
223 - full_fname(fname));
226 + && cmp_time(st->st_mtime, file->modtime) != 0) {
227 + mtime = file->modtime;
230 + mtime = st->st_mtime;
231 + if (updated && set_times(fname, mtime, atime) != 0) {
232 + rsyserr(FERROR, errno, "failed to set times on %s",
233 + full_fname(fname));
237 change_uid = am_root && preserve_uid && st->st_uid != file->uid;
238 --- orig/rsync.h 2005-02-14 02:45:10
239 +++ rsync.h 2004-07-03 20:15:41
241 #define XMIT_HAS_IDEV_DATA (1<<9)
242 #define XMIT_SAME_DEV (1<<10)
243 #define XMIT_RDEV_MINOR_IS_SMALL (1<<11)
244 +#define XMIT_SAME_ATIME (1<<12)
246 /* These flags are used in the live flist data. */
250 #define PERMS_REPORT (1<<0)
251 #define PERMS_SKIP_MTIME (1<<1)
252 +#define PERMS_SKIP_ATIME (1<<2)
255 #define NORMAL_FLUSH 0
256 @@ -483,6 +485,7 @@ struct file_struct {
264 --- orig/rsync.yo 2005-02-14 02:45:11
265 +++ rsync.yo 2005-01-24 01:57:18
266 @@ -322,6 +322,7 @@ to the detailed description below for a
267 -D, --devices preserve devices (root only)
268 -t, --times preserve times
269 -O, --omit-dir-times omit directories when preserving times
270 + -A, --copy-atimes copy access times
271 -S, --sparse handle sparse files efficiently
272 -n, --dry-run show what would have been transferred
273 -W, --whole-file copy files whole
274 @@ -643,6 +644,11 @@ dit(bf(-O, --omit-dir-times)) This tells
275 it is preserving modification times (see bf(--times)). If NFS is sharing
276 the directories on the receiving side, it is a good idea to use bf(-O).
278 +dit(bf(-A, --copy-atimes)) This tells rsync to transfer access times
279 +along with the files and update them on the remote system. Note that
280 +reading the source file may update the atime and hence repeated rsync
281 +copies with --copy-atimes may copy files unnecessarily.
283 dit(bf(-n, --dry-run)) This tells rsync to not do any file transfers,
284 instead it will just report the actions it would have taken.
286 --- orig/testsuite/copy-atimes.test 2004-06-30 00:06:23
287 +++ testsuite/copy-atimes.test 2004-06-30 00:06:23
291 +# Test rsync copying atimes
293 +. "$suitedir/rsync.fns"
299 +touch "$fromdir/foo"
300 +touch -a -t 200102031717.42 "$fromdir/foo"
304 +checkit "$RSYNC -rtAgvvv \"$fromdir/\" \"$todir/\"" "$fromdir" "$todir"
306 +# The script would have aborted on error, so getting here means we've won.
308 --- orig/testsuite/rsync.fns 2005-02-13 05:50:28
309 +++ testsuite/rsync.fns 2005-02-13 06:47:50
310 @@ -50,7 +50,7 @@ printmsg() {
314 - find "$@" -print | sort | sed 's/ /\\ /g' | xargs "$TOOLDIR/tls"
315 + find "$@" -print | sort | sed 's/ /\\ /g' | xargs "$TOOLDIR/tls" $TLS_ARGS
319 @@ -158,6 +158,8 @@ checkit() {
320 # We can just write everything to stdout/stderr, because the
321 # wrapper hides it unless there is a problem.
323 + ( cd "$2" && rsync_ls_lR . ) > "$tmpdir/ls-from"
325 echo "Running: \"$1\""
328 @@ -166,16 +168,16 @@ checkit() {
332 - echo "check how the files compare with diff:"
334 - diff -r $diffopt "$2" "$3" || failed=YES
336 - echo "-------------"
337 echo "check how the directory listings compare with diff:"
339 - ( cd "$2" && rsync_ls_lR . ) > "$tmpdir/ls-from"
340 ( cd "$3" && rsync_ls_lR . ) > "$tmpdir/ls-to"
341 diff $diffopt "$tmpdir/ls-from" "$tmpdir/ls-to" || failed=YES
343 + echo "-------------"
344 + echo "check how the files compare with diff:"
346 + diff -r $diffopt "$2" "$3" || failed=YES
348 if [ -z "$failed" ] ; then
351 --- orig/tls.c 2005-01-19 20:11:10
352 +++ tls.c 2004-07-03 20:15:41
359 #define PROGRAM "tls"
361 @@ -48,6 +49,7 @@ int read_only = 1;
363 int preserve_perms = 0;
365 +static int display_atime = 0;
367 static void failed(char const *what, char const *where)
369 @@ -56,14 +58,29 @@ static void failed(char const *what, cha
373 +static void storetime(char *dest, time_t t)
376 + struct tm *mt = gmtime(&t);
378 + sprintf(dest, "%04d-%02d-%02d %02d:%02d:%02d ",
379 + mt->tm_year + 1900,
390 static void list_file(const char *fname)
393 char permbuf[PERMSTRING_SIZE];
400 if (do_lstat(fname, &buf) < 0)
401 @@ -96,19 +113,8 @@ static void list_file(const char *fname)
403 permstring(permbuf, buf.st_mode);
405 - if (buf.st_mtime) {
406 - mt = gmtime(&buf.st_mtime);
408 - sprintf(datebuf, "%04d-%02d-%02d %02d:%02d:%02d",
409 - mt->tm_year + 1900,
416 - strcpy(datebuf, " ");
418 + storetime(mtimebuf, buf.st_mtime);
419 + storetime(atimebuf, buf.st_atime);
421 /* TODO: Perhaps escape special characters in fname? */
423 @@ -119,24 +125,55 @@ static void list_file(const char *fname)
424 (long)minor(buf.st_rdev));
425 } else /* NB: use double for size since it might not fit in a long. */
426 printf("%12.0f", (double)buf.st_size);
427 - printf(" %6ld.%-6ld %6ld %s %s%s\n",
428 + printf(" %6ld.%-6ld %6ld %s%s%s%s\n",
429 (long)buf.st_uid, (long)buf.st_gid, (long)buf.st_nlink,
430 - datebuf, fname, linkbuf);
431 + mtimebuf, display_atime ? atimebuf : "",
435 +static struct poptOption long_options[] = {
436 + /* longName, shortName, argInfo, argPtr, value, descrip, argDesc */
437 + {"atime", 'u', POPT_ARG_NONE, &display_atime, 0, 0, 0},
438 + {"help", 'h', POPT_ARG_NONE, 0, 'h', 0, 0},
442 +static void tls_usage(int ret)
444 + fprintf(stderr, "usage: " PROGRAM " [--atime | -u] DIR ...\n"
445 + "Trivial file listing program for portably checking rsync\n");
450 main(int argc, char *argv[])
453 - fprintf(stderr, "usage: " PROGRAM " DIR ...\n"
454 - "Trivial file listing program for portably checking rsync\n");
457 + const char **extra_args;
460 + pc = poptGetContext(PROGRAM, argc, (const char **)argv,
462 + while ((opt = poptGetNextOpt(pc)) != -1) {
469 + poptBadOption(pc, POPT_BADOPTION_NOALIAS),
470 + poptStrerror(opt));
475 - for (argv++; *argv; argv++) {
478 + extra_args = poptGetArgs(pc);
479 + if (*extra_args == NULL)
482 + for (; *extra_args; extra_args++)
483 + list_file(*extra_args);
484 + poptFreeContext(pc);
488 --- orig/util.c 2005-02-14 02:45:11
489 +++ util.c 2005-02-07 21:09:12
490 @@ -128,12 +128,17 @@ void overflow(char *str)
494 -int set_modtime(char *fname, time_t modtime)
495 +int set_times(char *fname, time_t modtime, time_t atime)
498 - rprintf(FINFO, "set modtime of %s to (%ld) %s",
499 + char mtimebuf[200];
501 + strlcpy(mtimebuf, timestring(modtime), sizeof mtimebuf);
503 + "set modtime, atime of %s to (%ld) %s, (%ld) %s\n",
504 safe_fname(fname), (long)modtime,
505 - asctime(localtime(&modtime)));
507 + (long)atime, timestring(atime));
511 @@ -142,17 +147,17 @@ int set_modtime(char *fname, time_t modt
515 - tbuf.actime = time(NULL);
516 + tbuf.actime = atime;
517 tbuf.modtime = modtime;
518 return utime(fname,&tbuf);
519 #elif defined HAVE_UTIME
524 return utime(fname,t);
527 - t[0].tv_sec = time(NULL);
528 + t[0].tv_sec = atime;
530 t[1].tv_sec = modtime;
532 @@ -1149,8 +1154,8 @@ int msleep(int t)
536 - * Determine if two file modification times are equivalent (either
537 - * exact or in the modification timestamp window established by
538 + * Determine if two file times are equivalent (either
539 + * exact or in the timestamp window established by
542 * @retval 0 if the times should be treated as the same
543 @@ -1159,7 +1164,7 @@ int msleep(int t)
545 * @retval -1 if the 2nd is later
547 -int cmp_modtime(time_t file1, time_t file2)
548 +int cmp_time(time_t file1, time_t file2)
551 if (file2 - file1 <= modify_window)