1 After applying this patch and running configure, you MUST run this
7 --- batch.c 15 May 2004 19:31:10 -0000 1.32
8 +++ batch.c 18 Jun 2004 17:23:13 -0000
9 @@ -335,6 +335,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 --- flist.c 18 Jun 2004 16:29:21 -0000 1.231
19 +++ flist.c 18 Jun 2004 17:23:13 -0000
20 @@ -58,6 +58,7 @@ extern int relative_paths;
21 extern int implied_dirs;
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 delete_excluded;
28 @@ -144,17 +145,17 @@ 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 - f_name(f), f->u.link);
37 + timestring(f->atime), f_name(f), 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),
46 + timestring(f->atime), f_name(f));
50 @@ -335,6 +336,7 @@ void send_file_entry(struct file_struct
53 static time_t modtime;
54 + static time_t atime;
58 @@ -350,7 +352,7 @@ void send_file_entry(struct file_struct
62 - modtime = 0, mode = 0;
63 + modtime = 0, atime = 0, mode = 0;
64 dev = 0, rdev = makedev(0, 0);
67 @@ -399,6 +401,12 @@ void send_file_entry(struct file_struct
68 flags |= XMIT_SAME_TIME;
70 modtime = file->modtime;
71 + if (copy_atimes && !S_ISDIR(mode)) {
72 + if (file->atime == atime)
73 + flags |= XMIT_SAME_ATIME;
75 + atime = file->atime;
78 #if SUPPORT_HARD_LINKS
79 if (file->link_u.idev) {
80 @@ -454,6 +462,8 @@ void send_file_entry(struct file_struct
81 write_int(f, modtime);
82 if (!(flags & XMIT_SAME_MODE))
83 write_int(f, to_wire_mode(mode));
84 + if (copy_atimes && !S_ISDIR(mode) && !(flags & XMIT_SAME_ATIME))
85 + write_int(f, atime);
86 if (preserve_uid && !(flags & XMIT_SAME_UID)) {
89 @@ -527,6 +537,7 @@ void receive_file_entry(struct file_stru
90 struct file_list *flist, int f)
92 static time_t modtime;
93 + static time_t atime;
97 @@ -543,7 +554,7 @@ void receive_file_entry(struct file_stru
98 struct file_struct *file;
101 - modtime = 0, mode = 0;
102 + modtime = 0, atime = 0, mode = 0;
103 dev = 0, rdev = makedev(0, 0);
106 @@ -598,6 +609,8 @@ void receive_file_entry(struct file_stru
107 modtime = (time_t)read_int(f);
108 if (!(flags & XMIT_SAME_MODE))
109 mode = from_wire_mode(read_int(f));
110 + if (copy_atimes && !S_ISDIR(mode) && !(flags & XMIT_SAME_ATIME))
111 + atime = (time_t)read_int(f);
113 if (preserve_uid && !(flags & XMIT_SAME_UID))
114 uid = (uid_t)read_int(f);
115 @@ -648,6 +661,7 @@ void receive_file_entry(struct file_stru
117 file->flags = flags & XMIT_TOP_DIR ? FLAG_TOP_DIR : 0;
118 file->modtime = modtime;
119 + file->atime = atime;
120 file->length = file_length;
123 @@ -867,6 +881,7 @@ skip_excludes:
126 file->modtime = st.st_mtime;
127 + file->atime = st.st_atime;
128 file->length = st.st_size;
129 file->mode = st.st_mode;
130 file->uid = st.st_uid;
131 --- generator.c 18 Jun 2004 16:30:24 -0000 1.88
132 +++ generator.c 18 Jun 2004 17:23:14 -0000
133 @@ -102,7 +102,7 @@ static int skip_file(char *fname, struct
137 - return (cmp_modtime(st->st_mtime,file->modtime) == 0);
138 + return cmp_time(st->st_mtime,file->modtime) == 0;
142 @@ -485,7 +485,7 @@ void recv_generator(char *fname, struct
146 - if (update_only && cmp_modtime(st.st_mtime,file->modtime)>0 && fnamecmp == fname) {
147 + if (update_only && cmp_time(st.st_mtime,file->modtime)>0 && fnamecmp == fname) {
149 rprintf(FINFO,"%s is newer\n",fname);
151 --- options.c 7 Jun 2004 22:05:22 -0000 1.156
152 +++ options.c 18 Jun 2004 17:23:14 -0000
153 @@ -48,6 +48,7 @@ int preserve_devices = 0;
154 int preserve_uid = 0;
155 int preserve_gid = 0;
156 int preserve_times = 0;
157 +int copy_atimes = 0;
161 @@ -245,6 +246,7 @@ void usage(enum logcode F)
162 rprintf(F," -g, --group preserve group\n");
163 rprintf(F," -D, --devices preserve devices (root only)\n");
164 rprintf(F," -t, --times preserve times\n");
165 + rprintf(F," -A, --copy-atimes copy access 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 rprintf(F," -W, --whole-file copy whole files, no incremental checks\n");
169 @@ -352,6 +354,7 @@ static struct poptOption long_options[]
170 {"group", 'g', POPT_ARG_NONE, &preserve_gid, 0, 0, 0 },
171 {"devices", 'D', POPT_ARG_NONE, &preserve_devices, 0, 0, 0 },
172 {"times", 't', POPT_ARG_NONE, &preserve_times, 0, 0, 0 },
173 + {"copy-atimes", 'A', POPT_ARG_NONE, ©_atimes, 0, 0, 0 },
174 {"checksum", 'c', POPT_ARG_NONE, &always_checksum, 0, 0, 0 },
175 {"verbose", 'v', POPT_ARG_NONE, 0, 'v', 0, 0 },
176 {"quiet", 'q', POPT_ARG_NONE, 0, 'q', 0, 0 },
177 @@ -841,6 +844,8 @@ void server_options(char **args,int *arg
186 --- rsync.c 11 Jun 2004 07:40:45 -0000 1.141
187 +++ rsync.c 18 Jun 2004 17:23:14 -0000
191 extern int preserve_times;
192 +extern int copy_atimes;
194 extern int am_sender;
195 extern int am_generator;
196 @@ -143,17 +144,31 @@ int set_perms(char *fname,struct file_st
197 if (!preserve_times || S_ISLNK(st->st_mode)
198 || (make_backups && !backup_dir && S_ISDIR(st->st_mode)))
199 flags |= PERMS_SKIP_MTIME;
200 - if (!(flags & PERMS_SKIP_MTIME)
201 - && cmp_modtime(st->st_mtime, file->modtime) != 0) {
202 + if (!copy_atimes || S_ISLNK(st->st_mode) || S_ISDIR(st->st_mode))
203 + flags |= PERMS_SKIP_ATIME;
204 + if (!(flags & (PERMS_SKIP_MTIME|PERMS_SKIP_ATIME))) {
205 + time_t atime, mtime;
207 + if (!(flags & PERMS_SKIP_ATIME)
208 + && cmp_time(st->st_atime, file->atime) != 0) {
209 + atime = file->atime;
212 + atime = st->st_atime;
213 + if (!(flags & PERMS_SKIP_MTIME)
214 + && cmp_time(st->st_mtime, file->modtime) != 0) {
215 + mtime = file->modtime;
218 + mtime = st->st_mtime;
219 /* don't complain about not setting times on directories
220 * because some filesystems can't do it */
221 - if (set_modtime(fname,file->modtime) != 0 &&
222 + if (updated && set_times(fname, mtime, atime) != 0 &&
223 !S_ISDIR(st->st_mode)) {
224 rsyserr(FERROR, errno, "failed to set times on %s",
231 change_uid = am_root && preserve_uid && st->st_uid != file->uid;
232 --- rsync.h 16 May 2004 07:28:24 -0000 1.204
233 +++ rsync.h 18 Jun 2004 17:23:14 -0000
235 #define XMIT_HAS_IDEV_DATA (1<<9)
236 #define XMIT_SAME_DEV (1<<10)
237 #define XMIT_RDEV_MINOR_IS_SMALL (1<<11)
238 +#define XMIT_SAME_ATIME (1<<12)
240 /* These flags are used in the live flist data. */
244 #define PERMS_REPORT (1<<0)
245 #define PERMS_SKIP_MTIME (1<<1)
246 +#define PERMS_SKIP_ATIME (1<<2)
249 #define NORMAL_FLUSH 0
250 @@ -422,6 +424,7 @@ struct file_struct {
258 --- rsync.yo 5 Jun 2004 16:16:30 -0000 1.171
259 +++ rsync.yo 18 Jun 2004 17:23:15 -0000
260 @@ -300,6 +300,7 @@ verb(
261 -g, --group preserve group
262 -D, --devices preserve devices (root only)
263 -t, --times preserve times
264 + -A, --copy-atimes copy access times
265 -S, --sparse handle sparse files efficiently
266 -n, --dry-run show what would have been transferred
267 -W, --whole-file copy whole files, no incremental checks
268 @@ -552,6 +553,11 @@ cause the next transfer to behave as if
269 their checksums compared and show up in log messages even if they haven't
272 +dit(bf(-A, --copy-atimes)) This tells rsync to transfer access times
273 +along with the files and update them on the remote system. Note that
274 +reading the source file may update the atime and hence repeated rsync
275 +copies with --copy-atimes may copy files unnecessarily.
277 dit(bf(-n, --dry-run)) This tells rsync to not do any file transfers,
278 instead it will just report the actions it would have taken.
280 --- tls.c 15 May 2004 19:09:42 -0000 1.20
281 +++ tls.c 18 Jun 2004 17:23:15 -0000
288 #define PROGRAM "tls"
290 @@ -48,6 +49,7 @@ int read_only = 1;
292 int preserve_perms = 0;
294 +static int display_atime = 0;
296 static void failed(char const *what, char const *where)
298 @@ -56,14 +58,29 @@ static void failed(char const *what, cha
302 +static void storetime(char *dest, time_t t)
305 + struct tm *mt = gmtime(&t);
307 + sprintf(dest, "%04d-%02d-%02d %02d:%02d:%02d ",
308 + mt->tm_year + 1900,
319 static void list_file(const char *fname)
322 char permbuf[PERMSTRING_SIZE];
329 if (do_lstat(fname, &buf) == -1)
330 @@ -96,19 +113,8 @@ static void list_file(const char *fname)
332 permstring(permbuf, buf.st_mode);
334 - if (buf.st_mtime) {
335 - mt = gmtime(&buf.st_mtime);
337 - sprintf(datebuf, "%04d-%02d-%02d %02d:%02d:%02d",
338 - mt->tm_year + 1900,
345 - strcpy(datebuf, " ");
347 + storetime(mtimebuf, buf.st_mtime);
348 + storetime(atimebuf, buf.st_atime);
350 /* TODO: Perhaps escape special characters in fname? */
352 @@ -119,24 +125,55 @@ static void list_file(const char *fname)
353 (long)minor(buf.st_rdev));
354 } else /* NB: use double for size since it might not fit in a long. */
355 printf("%12.0f", (double)buf.st_size);
356 - printf(" %6ld.%-6ld %6ld %s %s%s\n",
357 + printf(" %6ld.%-6ld %6ld %s%s%s%s\n",
358 (long)buf.st_uid, (long)buf.st_gid, (long)buf.st_nlink,
359 - datebuf, fname, linkbuf);
360 + mtimebuf, display_atime ? atimebuf : "",
364 +static struct poptOption long_options[] = {
365 + /* longName, shortName, argInfo, argPtr, value, descrip, argDesc */
366 + {"atime", 'u', POPT_ARG_NONE, &display_atime, 0, 0, 0},
367 + {"help", 'h', POPT_ARG_NONE, 0, 'h', 0, 0},
371 +static void tls_usage(int ret)
373 + fprintf(stderr, "usage: " PROGRAM " [--atime | -u] DIR ...\n"
374 + "Trivial file listing program for portably checking rsync\n");
379 main(int argc, char *argv[])
382 - fprintf(stderr, "usage: " PROGRAM " DIR ...\n"
383 - "Trivial file listing program for portably checking rsync\n");
386 + const char **extra_args;
389 + pc = poptGetContext(PROGRAM, argc, (const char **)argv,
391 + while ((opt = poptGetNextOpt(pc)) != -1) {
398 + poptBadOption(pc, POPT_BADOPTION_NOALIAS),
399 + poptStrerror(opt));
404 - for (argv++; *argv; argv++) {
407 + extra_args = poptGetArgs(pc);
408 + if (*extra_args == NULL)
411 + for (; *extra_args; extra_args++)
412 + list_file(*extra_args);
413 + poptFreeContext(pc);
417 --- util.c 9 Jun 2004 21:51:07 -0000 1.149
418 +++ util.c 18 Jun 2004 17:23:15 -0000
419 @@ -127,31 +127,39 @@ void overflow(char *str)
423 -int set_modtime(char *fname, time_t modtime)
424 +int set_times(char *fname, time_t modtime, time_t atime)
430 - rprintf(FINFO, "set modtime of %s to (%ld) %s",
431 + char mtimebuf[200];
432 + char atimebuf[200];
434 + strlcpy(mtimebuf, timestring(modtime), sizeof mtimebuf);
435 + strlcpy(atimebuf, timestring(atime), sizeof atimebuf);
438 + "set modtime, atime of %s to (%ld) %s, (%ld) %s\n",
439 fname, (long)modtime,
440 - asctime(localtime(&modtime)));
442 + (long)atime, atimebuf);
448 - tbuf.actime = time(NULL);
449 + tbuf.actime = atime;
450 tbuf.modtime = modtime;
451 return utime(fname,&tbuf);
452 #elif defined(HAVE_UTIME)
457 return utime(fname,t);
460 - t[0].tv_sec = time(NULL);
461 + t[0].tv_sec = atime;
463 t[1].tv_sec = modtime;
465 @@ -1078,8 +1086,8 @@ int msleep(int t)
469 - * Determine if two file modification times are equivalent (either
470 - * exact or in the modification timestamp window established by
471 + * Determine if two file times are equivalent (either
472 + * exact or in the timestamp window established by
475 * @retval 0 if the times should be treated as the same
476 @@ -1088,7 +1096,7 @@ int msleep(int t)
478 * @retval -1 if the 2nd is later
480 -int cmp_modtime(time_t file1, time_t file2)
481 +int cmp_time(time_t file1, time_t file2)
484 if (file2 - file1 <= modify_window)
485 --- /dev/null 1 Jan 1970 00:00:00 -0000
486 +++ testsuite/copy-atimes.test 18 Jun 2004 17:23:15 -0000
490 +# Test rsync copying atimes
492 +. "$suitedir/rsync.fns"
498 +touch "$fromdir/foo"
499 +touch -a -t 200102031717.42 "$fromdir/foo"
503 +checkit "$RSYNC -rtAgvvv \"$fromdir/\" \"$todir/\"" "$fromdir" "$todir"
505 +# The script would have aborted on error, so getting here means we've won.
507 --- testsuite/rsync.fns 18 May 2004 00:41:55 -0000 1.60
508 +++ testsuite/rsync.fns 18 Jun 2004 17:23:15 -0000
509 @@ -50,7 +50,7 @@ printmsg() {
513 - find "$@" -print | sort | xargs "$TOOLDIR/tls"
514 + find "$@" -print | sort | xargs "$TOOLDIR/tls" $TLS_ARGS
518 @@ -150,6 +150,8 @@ checkit() {
519 # We can just write everything to stdout/stderr, because the
520 # wrapper hides it unless there is a problem.
522 + ( cd "$2" && rsync_ls_lR . ) > "$tmpdir/ls-from"
524 echo "Running: \"$1\""
527 @@ -158,6 +160,12 @@ checkit() {
531 + echo "check how the directory listings compare with diff:"
533 + ( cd "$3" && rsync_ls_lR . ) > "$tmpdir/ls-to"
534 + diff $diffopt "$tmpdir/ls-from" "$tmpdir/ls-to" || failed=YES
536 + echo "-------------"
537 echo "check how the files compare with diff:"
539 for f in `cd "$2"; find . -type f -print `
540 @@ -165,12 +173,6 @@ checkit() {
541 diff $diffopt "$2"/"$f" "$3"/"$f" || failed=YES
544 - echo "-------------"
545 - echo "check how the directory listings compare with diff:"
547 - ( cd "$2" && rsync_ls_lR . ) > "$tmpdir/ls-from"
548 - ( cd "$3" && rsync_ls_lR . ) > "$tmpdir/ls-to"
549 - diff $diffopt "$tmpdir/ls-from" "$tmpdir/ls-to" || failed=YES
550 if [ -z "$failed" ] ; then