1 After applying this patch, run these commands for a successful build:
4 ./configure (optional if already run)
10 @@ -51,6 +51,7 @@ extern int preserve_devices;
11 extern int preserve_specials;
12 extern int preserve_uid;
13 extern int preserve_gid;
14 +extern int preserve_atimes;
15 extern int relative_paths;
16 extern int implied_dirs;
17 extern int prune_empty_dirs;
18 @@ -85,7 +86,13 @@ void init_flist(void)
21 /* Figure out how big the file_struct is without trailing padding */
22 - file_struct_len = offsetof(struct file_struct, flags) + sizeof f.flags;
23 + if (preserve_atimes)
24 + file_struct_len = offsetof(struct file_struct, fl4g5);
26 + file_struct_len = offsetof(struct file_struct, atime);
27 + /* The "flags" uchar is no longer accessed directly, so I
28 + * mangled the name to fl4g5 as a reminder. */
29 + file_struct_len += sizeof f.fl4g5;
30 checksum_len = protocol_version < 21 ? 2 : MD4_SUM_LENGTH;
33 @@ -141,16 +148,18 @@ static void list_file_entry(struct file_
36 if (preserve_links && S_ISLNK(f->mode)) {
37 - rprintf(FINFO, "%s %11.0f %s %s -> %s\n",
38 + rprintf(FINFO, "%s %11.0f %s %s %s -> %s\n",
40 (double)f->length, timestring(f->modtime),
41 + preserve_atimes ? timestring(f->atime) : "",
42 f_name(f, NULL), f->u.link);
46 - rprintf(FINFO, "%s %11.0f %s %s\n",
47 + rprintf(FINFO, "%s %11.0f %s %s %s\n",
49 (double)f->length, timestring(f->modtime),
50 + preserve_atimes ? timestring(f->atime) : "",
54 @@ -312,6 +321,7 @@ static void send_file_entry(struct file_
57 static time_t modtime;
58 + static time_t atime;
62 @@ -327,7 +337,7 @@ static void send_file_entry(struct file_
66 - modtime = 0, mode = 0;
67 + modtime = 0, atime = 0, mode = 0;
68 dev = 0, rdev = makedev(0, 0);
71 @@ -339,7 +349,7 @@ static void send_file_entry(struct file_
75 - flags = file->flags & XMIT_TOP_DIR;
76 + flags = FFLAGS(file) & XMIT_TOP_DIR;
78 if (file->mode == mode)
79 flags |= XMIT_SAME_MODE;
80 @@ -375,6 +385,12 @@ static void send_file_entry(struct file_
81 flags |= XMIT_SAME_TIME;
83 modtime = file->modtime;
84 + if (preserve_atimes && !S_ISDIR(mode)) {
85 + if (file->atime == atime)
86 + flags |= XMIT_SAME_ATIME;
88 + atime = file->atime;
91 #ifdef SUPPORT_HARD_LINKS
92 if (file->link_u.idev) {
93 @@ -428,6 +444,8 @@ static void send_file_entry(struct file_
94 write_int(f, modtime);
95 if (!(flags & XMIT_SAME_MODE))
96 write_int(f, to_wire_mode(mode));
97 + if (preserve_atimes && !S_ISDIR(mode) && !(flags & XMIT_SAME_ATIME))
98 + write_int(f, atime);
99 if (preserve_uid && !(flags & XMIT_SAME_UID)) {
102 @@ -496,6 +514,7 @@ static struct file_struct *receive_file_
103 unsigned short flags, int f)
105 static time_t modtime;
106 + static time_t atime;
110 @@ -514,7 +533,7 @@ static struct file_struct *receive_file_
111 struct file_struct *file;
114 - modtime = 0, mode = 0;
115 + modtime = 0, atime = 0, mode = 0;
116 dev = 0, rdev = makedev(0, 0);
119 @@ -570,6 +589,8 @@ static struct file_struct *receive_file_
120 modtime = (time_t)read_int(f);
121 if (!(flags & XMIT_SAME_MODE))
122 mode = from_wire_mode(read_int(f));
123 + if (preserve_atimes && !S_ISDIR(mode) && !(flags & XMIT_SAME_ATIME))
124 + atime = (time_t)read_int(f);
126 if (chmod_modes && !S_ISLNK(mode))
127 mode = tweak_mode(mode, chmod_modes);
128 @@ -625,6 +646,8 @@ static struct file_struct *receive_file_
132 + if (preserve_atimes)
133 + file->atime = atime;
136 file->dirname = lastdir = bp;
137 @@ -650,12 +673,12 @@ static struct file_struct *receive_file_
138 && lastname[del_hier_name_len-1] == '.'
139 && lastname[del_hier_name_len-2] == '/')
140 del_hier_name_len -= 2;
141 - file->flags |= FLAG_TOP_DIR | FLAG_DEL_HERE;
142 + FFLAGS(file) |= FLAG_TOP_DIR | FLAG_DEL_HERE;
143 } else if (in_del_hier) {
144 if (!relative_paths || !del_hier_name_len
145 || (l1 >= del_hier_name_len
146 && lastname[del_hier_name_len] == '/'))
147 - file->flags |= FLAG_DEL_HERE;
148 + FFLAGS(file) |= FLAG_DEL_HERE;
152 @@ -871,12 +894,14 @@ struct file_struct *make_file(char *fnam
153 memset(bp, 0, file_struct_len);
154 bp += file_struct_len;
156 - file->flags = flags;
157 + FFLAGS(file) = flags;
158 file->modtime = st.st_mtime;
159 file->length = st.st_size;
160 file->mode = st.st_mode;
161 file->uid = st.st_uid;
162 file->gid = st.st_gid;
163 + if (preserve_atimes)
164 + file->atime = st.st_atime;
166 #ifdef SUPPORT_HARD_LINKS
167 if (flist && flist->hlink_pool) {
168 @@ -989,7 +1014,7 @@ static void send_if_directory(int f, str
169 char is_dot_dir = fbuf[ol-1] == '.' && (ol == 1 || fbuf[ol-2] == '/');
171 if (S_ISDIR(file->mode)
172 - && !(file->flags & FLAG_MOUNT_POINT) && f_name(file, fbuf)) {
173 + && !(FFLAGS(file) & FLAG_MOUNT_POINT) && f_name(file, fbuf)) {
175 unsigned int len = strlen(fbuf);
176 if (len > 1 && fbuf[len-1] == '/')
177 @@ -1595,8 +1620,9 @@ static void clean_flist(struct file_list
179 /* Make sure we don't lose track of a user-specified
181 - flist->files[keep]->flags |= flist->files[drop]->flags
182 - & (FLAG_TOP_DIR|FLAG_DEL_HERE);
183 + FFLAGS(flist->files[keep])
184 + |= FFLAGS(flist->files[drop])
185 + & (FLAG_TOP_DIR|FLAG_DEL_HERE);
187 clear_file(flist->files[drop], flist);
189 @@ -1720,7 +1746,7 @@ static void output_flist(struct file_lis
190 file->dirname ? file->dirname : "",
191 file->dirname ? "/" : "", NS(file->basename),
192 S_ISDIR(file->mode) ? "/" : "", (int)file->mode,
193 - (double)file->length, uidbuf, gidbuf, file->flags);
194 + (double)file->length, uidbuf, gidbuf, FFLAGS(file));
200 @@ -44,6 +44,7 @@ extern int preserve_perms;
201 extern int preserve_uid;
202 extern int preserve_gid;
203 extern int preserve_times;
204 +extern int preserve_atimes;
205 extern int omit_dir_times;
206 extern int delete_mode;
207 extern int delete_before;
208 @@ -91,6 +92,7 @@ extern dev_t filesystem_dev;
209 extern char *backup_dir;
210 extern char *backup_suffix;
211 extern int backup_suffix_len;
212 +extern unsigned int file_struct_len;
213 extern struct file_list *the_file_list;
214 extern struct filter_list_struct server_filter_list;
216 @@ -185,7 +187,7 @@ static int delete_item(char *fname, int
217 for (j = dirlist->count; j--; ) {
218 struct file_struct *fp = dirlist->files[j];
220 - if (fp->flags & FLAG_MOUNT_POINT)
221 + if (FFLAGS(fp) & FLAG_MOUNT_POINT)
224 strlcpy(p, fp->basename, remainder);
225 @@ -263,7 +265,7 @@ static void delete_in_dir(struct file_li
226 filt_array[cur_depth] = push_local_filters(fbuf, dlen);
228 if (one_file_system) {
229 - if (file->flags & FLAG_TOP_DIR)
230 + if (FFLAGS(file) & FLAG_TOP_DIR)
231 filesystem_dev = stp->st_dev;
232 else if (filesystem_dev != stp->st_dev)
234 @@ -275,7 +277,7 @@ static void delete_in_dir(struct file_li
235 * from the filesystem. */
236 for (i = dirlist->count; i--; ) {
237 struct file_struct *fp = dirlist->files[i];
238 - if (!fp->basename || fp->flags & FLAG_MOUNT_POINT)
239 + if (!fp->basename || FFLAGS(fp) & FLAG_MOUNT_POINT)
241 if (flist_find(flist, fp) < 0) {
243 @@ -301,11 +303,11 @@ static void do_delete_pass(struct file_l
244 for (j = 0; j < flist->count; j++) {
245 struct file_struct *file = flist->files[j];
247 - if (!(file->flags & FLAG_DEL_HERE))
248 + if (!(FFLAGS(file) & FLAG_DEL_HERE))
252 - if (verbose > 1 && file->flags & FLAG_TOP_DIR)
253 + if (verbose > 1 && FFLAGS(file) & FLAG_TOP_DIR)
254 rprintf(FINFO, "deleting in %s\n", fbuf);
256 if (link_stat(fbuf, &st, keep_dirlinks) < 0
257 @@ -349,6 +351,9 @@ void itemize(struct file_struct *file, i
258 && (!(iflags & ITEM_XNAME_FOLLOWS) || *xname))
259 || (keep_time && cmp_time(file->modtime, st->st_mtime) != 0))
260 iflags |= ITEM_REPORT_TIME;
261 + if (preserve_atimes && !S_ISDIR(file->mode) && !S_ISLNK(file->mode)
262 + && cmp_time(file->atime, st->st_atime) != 0)
263 + iflags |= ITEM_REPORT_ATIME;
264 if ((file->mode & CHMOD_BITS) != (st->st_mode & CHMOD_BITS))
265 iflags |= ITEM_REPORT_PERMS;
266 if (preserve_uid && am_root && file->uid != st->st_uid)
267 @@ -550,7 +555,7 @@ static int find_fuzzy(struct file_struct
270 if (!S_ISREG(fp->mode) || !fp->length
271 - || fp->flags & FLAG_NO_FUZZY)
272 + || FFLAGS(fp) & FLAG_NO_FUZZY)
276 @@ -659,6 +664,8 @@ static int try_dests_reg(struct file_str
277 itemizing && verbose > 1,
280 + if (preserve_atimes)
281 + set_file_attrs(fname, file, stp, 0);
282 if (preserve_hard_links && file->link_u.links)
283 hard_link_cluster(file, ndx, itemizing, code);
284 } else if (itemizing)
285 @@ -894,7 +901,7 @@ static void recv_generator(char *fname,
286 && verbose && code && f_out != -1)
287 rprintf(code, "%s/\n", fname);
288 if (delete_during && f_out != -1 && !phase && dry_run < 2
289 - && (file->flags & FLAG_DEL_HERE))
290 + && (FFLAGS(file) & FLAG_DEL_HERE))
291 delete_in_dir(the_file_list, fname, file, &st);
294 @@ -1176,7 +1183,7 @@ static void recv_generator(char *fname,
296 int j = flist_find(fuzzy_dirlist, file);
297 if (j >= 0) /* don't use changing file as future fuzzy basis */
298 - fuzzy_dirlist->files[j]->flags |= FLAG_NO_FUZZY;
299 + FFLAGS(fuzzy_dirlist->files[j]) |= FLAG_NO_FUZZY;
305 @@ -26,6 +26,7 @@ extern int link_dest;
306 extern int make_backups;
307 extern int log_format_has_i;
308 extern char *basis_dir[];
309 +extern unsigned int file_struct_len;
310 extern struct file_list *the_file_list;
312 #ifdef SUPPORT_HARD_LINKS
313 @@ -86,10 +87,10 @@ static void link_idev_data(void)
314 FPTR(cur)->link_u.links = pool_talloc(hlink_pool,
315 struct hlink, 1, "hlink_list");
317 - FPTR(head)->flags |= FLAG_HLINK_TOL;
318 + FFLAGS(FPTR(head)) |= FLAG_HLINK_TOL;
319 FPTR(cur)->F_HLINDEX = to;
320 FPTR(cur)->F_NEXT = head;
321 - FPTR(cur)->flags |= FLAG_HLINK_EOL;
322 + FFLAGS(FPTR(cur)) |= FLAG_HLINK_EOL;
323 hlink_list[to++] = head;
325 FPTR(cur)->link_u.links = NULL;
326 @@ -175,7 +176,7 @@ int hard_link_check(struct file_struct *
328 #ifdef SUPPORT_HARD_LINKS
330 - if (skip && !(file->flags & FLAG_HLINK_EOL))
331 + if (skip && !(FFLAGS(file) & FLAG_HLINK_EOL))
332 head = hlink_list[file->F_HLINDEX] = file->F_NEXT;
334 head = hlink_list[file->F_HLINDEX];
335 @@ -270,8 +271,8 @@ void hard_link_cluster(struct file_struc
336 file->F_HLINDEX = FINISHED_LINK;
337 if (link_stat(f_name(file, hlink1), &st1, 0) < 0)
339 - if (!(file->flags & FLAG_HLINK_TOL)) {
340 - while (!(file->flags & FLAG_HLINK_EOL)) {
341 + if (!(FFLAGS(file) & FLAG_HLINK_TOL)) {
342 + while (!(FFLAGS(file) & FLAG_HLINK_EOL)) {
346 @@ -286,6 +287,6 @@ void hard_link_cluster(struct file_struc
347 maybe_hard_link(file, ndx, hlink2, statret, &st2,
348 hlink1, &st1, itemizing, code);
349 file->F_HLINDEX = FINISHED_LINK;
350 - } while (!(file->flags & FLAG_HLINK_EOL));
351 + } while (!(FFLAGS(file) & FLAG_HLINK_EOL));
356 @@ -42,6 +42,7 @@ extern int msg_fd_out;
357 extern int allow_8bit_chars;
358 extern int protocol_version;
359 extern int preserve_times;
360 +extern int preserve_atimes;
361 extern int log_format_has_i;
362 extern int log_format_has_o_or_i;
363 extern int daemon_log_format_has_o_or_i;
364 @@ -605,10 +606,12 @@ static void log_formatted(enum logcode c
365 n[3] = !(iflags & ITEM_REPORT_SIZE) ? '.' : 's';
366 n[4] = !(iflags & ITEM_REPORT_TIME) ? '.'
367 : !preserve_times || S_ISLNK(file->mode) ? 'T' : 't';
368 - n[5] = !(iflags & ITEM_REPORT_PERMS) ? '.' : 'p';
369 - n[6] = !(iflags & ITEM_REPORT_OWNER) ? '.' : 'o';
370 - n[7] = !(iflags & ITEM_REPORT_GROUP) ? '.' : 'g';
372 + n[5] = !(iflags & ITEM_REPORT_ATIME) ? '.'
373 + : S_ISLNK(file->mode) ? 'U' : 'u';
374 + n[6] = !(iflags & ITEM_REPORT_PERMS) ? '.' : 'p';
375 + n[7] = !(iflags & ITEM_REPORT_OWNER) ? '.' : 'o';
376 + n[8] = !(iflags & ITEM_REPORT_GROUP) ? '.' : 'g';
379 if (iflags & (ITEM_IS_NEW|ITEM_MISSING_DATA)) {
380 char ch = iflags & ITEM_IS_NEW ? '+' : '?';
383 @@ -52,6 +52,7 @@ int preserve_uid = 0;
384 int preserve_gid = 0;
385 int preserve_times = 0;
386 int omit_dir_times = 0;
387 +int preserve_atimes = 0;
391 @@ -300,8 +301,9 @@ void usage(enum logcode F)
392 rprintf(F," --devices preserve device files (super-user only)\n");
393 rprintf(F," --specials preserve special files\n");
394 rprintf(F," -D same as --devices --specials\n");
395 - rprintf(F," -t, --times preserve times\n");
396 - rprintf(F," -O, --omit-dir-times omit directories when preserving times\n");
397 + rprintf(F," -t, --times preserve modify times\n");
398 + rprintf(F," -O, --omit-dir-times omit directories when preserving modify times\n");
399 + rprintf(F," -U, --atimes preserve access (use) times\n");
400 rprintf(F," --super receiver attempts super-user activities\n");
401 rprintf(F," -S, --sparse handle sparse files efficiently\n");
402 rprintf(F," -n, --dry-run show what would have been transferred\n");
403 @@ -414,6 +416,9 @@ static struct poptOption long_options[]
404 {"times", 't', POPT_ARG_VAL, &preserve_times, 1, 0, 0 },
405 {"no-times", 0, POPT_ARG_VAL, &preserve_times, 0, 0, 0 },
406 {"no-t", 0, POPT_ARG_VAL, &preserve_times, 0, 0, 0 },
407 + {"atimes", 'U', POPT_ARG_VAL, &preserve_atimes, 1, 0, 0 },
408 + {"no-atimes", 0, POPT_ARG_VAL, &preserve_atimes, 0, 0, 0 },
409 + {"no-k", 0, POPT_ARG_VAL, &preserve_atimes, 0, 0, 0 },
410 {"omit-dir-times", 'O', POPT_ARG_VAL, &omit_dir_times, 2, 0, 0 },
411 {"modify-window", 0, POPT_ARG_INT, &modify_window, OPT_MODIFY_WINDOW, 0, 0 },
412 {"super", 0, POPT_ARG_VAL, &am_root, 2, 0, 0 },
413 @@ -1508,6 +1513,8 @@ void server_options(char **args,int *arg
417 + if (preserve_atimes)
421 else if (preserve_executability && am_sender)
424 @@ -37,6 +37,7 @@ extern int preserve_perms;
425 extern int preserve_executability;
426 extern int preserve_times;
427 extern int omit_dir_times;
428 +extern int preserve_atimes;
429 extern int orig_umask;
431 extern int am_server;
432 @@ -125,6 +126,7 @@ int set_file_attrs(char *fname, struct f
435 int change_uid, change_gid;
436 + time_t atime, mtime;
440 @@ -143,18 +145,33 @@ int set_file_attrs(char *fname, struct f
444 + /* This code must be the first update in the function due to
445 + * how it uses the "updated" variable. */
446 if (!preserve_times || (S_ISDIR(st->st_mode) && omit_dir_times))
447 flags |= ATTRS_SKIP_MTIME;
448 + if (!preserve_atimes || S_ISDIR(st->st_mode))
449 + flags |= ATTRS_SKIP_ATIME;
450 if (!(flags & ATTRS_SKIP_MTIME)
451 && cmp_time(st->st_mtime, file->modtime) != 0) {
452 - int ret = set_modtime(fname, file->modtime, st->st_mode);
453 + mtime = file->modtime;
456 + mtime = st->st_mtime;
457 + if (!(flags & ATTRS_SKIP_ATIME)
458 + && cmp_time(st->st_atime, file->atime) != 0) {
459 + atime = file->atime;
462 + atime = st->st_atime;
464 + int ret = set_times(fname, mtime, atime, st->st_mode);
466 rsyserr(FERROR, errno, "failed to set times on %s",
470 - if (ret == 0) /* ret == 1 if symlink could not be set */
472 + if (ret > 0) /* ret == 1 if symlink could not be set */
476 change_uid = am_root && preserve_uid && st->st_uid != file->uid;
480 #define XMIT_HAS_IDEV_DATA (1<<9)
481 #define XMIT_SAME_DEV (1<<10)
482 #define XMIT_RDEV_MINOR_IS_SMALL (1<<11)
483 +#define XMIT_SAME_ATIME (1<<12)
485 /* These flags are used in the live flist data. */
489 #define ATTRS_REPORT (1<<0)
490 #define ATTRS_SKIP_MTIME (1<<1)
491 +#define ATTRS_SKIP_ATIME (1<<2)
494 #define NORMAL_FLUSH 0
496 #define FNAMECMP_FUZZY 0x83
498 /* For use by the itemize_changes code */
499 +#define ITEM_REPORT_ATIME (1<<0)
500 #define ITEM_REPORT_CHECKSUM (1<<1)
501 #define ITEM_REPORT_SIZE (1<<2)
502 #define ITEM_REPORT_TIME (1<<3)
503 @@ -520,9 +523,12 @@ struct file_struct {
507 - uchar flags; /* this item MUST remain last */
508 + time_t atime; /* this MUST be second to last */
509 + uchar fl4g5; /* this item MUST remain last */
512 +#define FFLAGS(f) ((uchar*)(f))[file_struct_len-1]
515 * Start the flist array at FLIST_START entries and grow it
516 * by doubling until FLIST_LINEAR then grow by FLIST_LINEAR
519 @@ -323,8 +323,9 @@ to the detailed description below for a
520 --devices preserve device files (super-user only)
521 --specials preserve special files
522 -D same as --devices --specials
523 - -t, --times preserve times
524 - -O, --omit-dir-times omit directories when preserving times
525 + -t, --times preserve modify times
526 + -O, --omit-dir-times omit directories when preserving mod-times
527 + -U, --atimes preserve access (use) times
528 --super receiver attempts super-user activities
529 -S, --sparse handle sparse files efficiently
530 -n, --dry-run show what would have been transferred
531 @@ -801,6 +802,12 @@ it is preserving modification times (see
532 the directories on the receiving side, it is a good idea to use bf(-O).
533 This option is inferred if you use bf(--backup) without bf(--backup-dir).
535 +dit(bf(-U, --atimes)) This tells rsync to set the access (use) times of the
536 +destination files to the same value as the source files. Note that the
537 +reading of the source file may update the atime of the source files, so
538 +repeated rsync runs with --atimes may be needed if you want to force the
539 +access-time values to be 100% identical on the two systems.
541 dit(bf(--super)) This tells the receiving side to attempt super-user
542 activities even if the receiving rsync wasn't run by the super-user. These
543 activities include: preserving users via the bf(--owner) option, preserving
544 @@ -1308,8 +1315,8 @@ if the receiving rsync is at least versi
545 with older versions of rsync, but that also turns on the output of other
548 -The "%i" escape has a cryptic output that is 8 letters long. The general
549 -format is like the string bf(YXcstpog), where bf(Y) is replaced by the
550 +The "%i" escape has a cryptic output that is 9 letters long. The general
551 +format is like the string bf(YXcstupog), where bf(Y) is replaced by the
552 kind of update being done, bf(X) is replaced by the file-type, and the
553 other letters represent attributes that may be output if they are being
555 @@ -1349,9 +1356,13 @@ quote(itemize(
556 by the file transfer.
557 it() A bf(t) means the modification time is different and is being updated
558 to the sender's value (requires bf(--times)). An alternate value of bf(T)
559 - means that the time will be set to the transfer time, which happens
560 + means that the modify time will be set to the transfer time, which happens
561 anytime a symlink is transferred, or when a file or device is transferred
563 + it() A bf(u) means the access (use) time is different and is being updated to
564 + the sender's value (requires bf(--atimes)). An alternate value of bf(U)
565 + means that the access time will be set to the transfer time, which happens
566 + anytime a symlink is transferred.
567 it() A bf(p) means the permissions are different and are being updated to
568 the sender's value (requires bf(--perms)).
569 it() An bf(o) means the owner is different and is being updated to the
572 @@ -38,6 +38,7 @@ extern int do_progress;
575 extern int write_batch;
576 +extern unsigned int file_struct_len;
577 extern struct stats stats;
578 extern struct file_list *the_file_list;
579 extern char *log_format;
580 @@ -126,7 +127,7 @@ void successful_send(int ndx)
582 file = the_file_list->files[ndx];
583 /* The generator might tell us about symlinks we didn't send. */
584 - if (!(file->flags & FLAG_SENT) && !S_ISLNK(file->mode))
585 + if (!(FFLAGS(file) & FLAG_SENT) && !S_ISLNK(file->mode))
587 if (file->dir.root) {
588 offset = stringjoin(fname, sizeof fname,
589 @@ -370,7 +371,7 @@ void send_files(struct file_list *flist,
590 rprintf(FINFO, "sender finished %s\n", fname);
592 /* Flag that we actually sent this entry. */
593 - file->flags |= FLAG_SENT;
594 + FFLAGS(file) |= FLAG_SENT;
596 make_backups = save_make_backups;
598 --- old/testsuite/atimes.test
599 +++ new/testsuite/atimes.test
603 +# Test rsync copying atimes
605 +. "$suitedir/rsync.fns"
611 +touch "$fromdir/foo"
612 +touch -a -t 200102031717.42 "$fromdir/foo"
616 +checkit "$RSYNC -rtUgvvv \"$fromdir/\" \"$todir/\"" "$fromdir" "$todir"
618 +# The script would have aborted on error, so getting here means we've won.
620 --- old/testsuite/devices.test
621 +++ new/testsuite/devices.test
622 @@ -42,14 +42,14 @@ touch -r "$fromdir/block" "$fromdir/bloc
623 $RSYNC -ai "$fromdir/block" "$todir/block2" \
625 cat <<EOT >"$chkfile"
629 diff $diffopt "$chkfile" "$outfile" || test_fail "test 1 failed"
631 $RSYNC -ai "$fromdir/block2" "$todir/block" \
633 cat <<EOT >"$chkfile"
637 diff $diffopt "$chkfile" "$outfile" || test_fail "test 2 failed"
639 @@ -58,7 +58,7 @@ sleep 1
640 $RSYNC -Di "$fromdir/block3" "$todir/block" \
642 cat <<EOT >"$chkfile"
646 diff $diffopt "$chkfile" "$outfile" || test_fail "test 3 failed"
648 @@ -66,15 +66,15 @@ $RSYNC -aiHvv "$fromdir/" "$todir/" \
651 cat <<EOT >"$chkfile"
656 -hD++++++ block2.5 => block3
665 +hD+++++++ block2.5 => block3
671 if test ! -b "$fromdir/block2.5"; then
672 sed -e '/block2\.5/d' \
673 --- old/testsuite/itemize.test
674 +++ new/testsuite/itemize.test
675 @@ -29,14 +29,14 @@ ln "$fromdir/foo/config1" "$fromdir/foo/
676 $RSYNC -iplr "$fromdir/" "$todir/" \
678 cat <<EOT >"$chkfile"
681 ->f++++++ bar/baz/rsync
683 ->f++++++ foo/config1
684 ->f++++++ foo/config2
686 -cL++++++ foo/sym -> ../bar/baz/rsync
689 +>f+++++++ bar/baz/rsync
691 +>f+++++++ foo/config1
692 +>f+++++++ foo/config2
694 +cL+++++++ foo/sym -> ../bar/baz/rsync
696 diff $diffopt "$chkfile" "$outfile" || test_fail "test 1 failed"
698 @@ -48,10 +48,10 @@ chmod 601 "$fromdir/foo/config2"
699 $RSYNC -iplrH "$fromdir/" "$todir/" \
701 cat <<EOT >"$chkfile"
702 ->f..T... bar/baz/rsync
703 ->f..T... foo/config1
704 ->f.sTp.. foo/config2
705 -hf..T... foo/extra => foo/config1
706 +>f..T.... bar/baz/rsync
707 +>f..T.... foo/config1
708 +>f.sT.p.. foo/config2
709 +hf..T.... foo/extra => foo/config1
711 diff $diffopt "$chkfile" "$outfile" || test_fail "test 2 failed"
713 @@ -68,11 +68,11 @@ chmod 777 "$todir/bar/baz/rsync"
714 $RSYNC -iplrtc "$fromdir/" "$todir/" \
716 cat <<EOT >"$chkfile"
717 -.f..tp.. bar/baz/rsync
719 -.f..t... foo/config1
720 ->fcstp.. foo/config2
721 -cL..T... foo/sym -> ../bar/baz/rsync
722 +.f..t.p.. bar/baz/rsync
724 +.f..t.... foo/config1
725 +>fcst.p.. foo/config2
726 +cL..T.... foo/sym -> ../bar/baz/rsync
728 diff $diffopt "$chkfile" "$outfile" || test_fail "test 3 failed"
730 @@ -97,15 +97,15 @@ $RSYNC -ivvplrtH "$fromdir/" "$todir/" \
733 cat <<EOT >"$chkfile"
737 -.f...p.. bar/baz/rsync
740 ->f..t... foo/config2
742 -.L foo/sym -> ../bar/baz/rsync
746 +.f....p.. bar/baz/rsync
749 +>f..t.... foo/config2
751 +.L foo/sym -> ../bar/baz/rsync
753 diff $diffopt "$chkfile" "$outfile" || test_fail "test 5 failed"
755 @@ -124,8 +124,8 @@ touch "$todir/foo/config2"
756 $RSYNC -iplrtH "$fromdir/" "$todir/" \
758 cat <<EOT >"$chkfile"
759 -.f...p.. foo/config1
760 ->f..t... foo/config2
761 +.f....p.. foo/config1
762 +>f..t.... foo/config2
764 diff $diffopt "$chkfile" "$outfile" || test_fail "test 7 failed"
766 @@ -134,15 +134,15 @@ $RSYNC -ivvplrtH --copy-dest="$lddir" "$
769 cat <<EOT >"$chkfile"
777 -hf foo/extra => foo/config1
778 -cL..T... foo/sym -> ../bar/baz/rsync
786 +hf foo/extra => foo/config1
787 +cL..T.... foo/sym -> ../bar/baz/rsync
789 diff $diffopt "$chkfile" "$outfile" || test_fail "test 8 failed"
791 @@ -150,11 +150,11 @@ rm -rf "$todir"
792 $RSYNC -iplrtH --copy-dest="$lddir" "$fromdir/" "$todir/" \
794 cat <<EOT >"$chkfile"
799 -hf foo/extra => foo/config1
804 +hf foo/extra => foo/config1
806 diff $diffopt "$chkfile" "$outfile" || test_fail "test 9 failed"
808 @@ -181,15 +181,15 @@ $RSYNC -ivvplrtH --link-dest="$lddir" "$
811 cat <<EOT >"$chkfile"
819 -hf foo/extra => foo/config1
820 -hL foo/sym -> ../bar/baz/rsync
828 +hf foo/extra => foo/config1
829 +hL foo/sym -> ../bar/baz/rsync
831 diff $diffopt "$chkfile" "$outfile" || test_fail "test 11 failed"
833 @@ -197,10 +197,10 @@ rm -rf "$todir"
834 $RSYNC -iplrtH --link-dest="$lddir" "$fromdir/" "$todir/" \
836 cat <<EOT >"$chkfile"
846 diff $diffopt "$chkfile" "$outfile" || test_fail "test 12 failed"
848 @@ -228,14 +228,14 @@ filter_outfile
849 # TODO fix really-old problem when combining -H with --compare-dest:
850 # missing output for foo/extra hard-link (and it might not be updated)!
851 cat <<EOT >"$chkfile"
859 -.L foo/sym -> ../bar/baz/rsync
867 +.L foo/sym -> ../bar/baz/rsync
869 diff $diffopt "$chkfile" "$outfile" || test_fail "test 14 failed"
871 @@ -243,10 +243,10 @@ rm -rf "$todir"
872 $RSYNC -iplrtH --compare-dest="$lddir" "$fromdir/" "$todir/" \
874 cat <<EOT >"$chkfile"
884 diff $diffopt "$chkfile" "$outfile" || test_fail "test 15 failed"
886 --- old/testsuite/rsync.fns
887 +++ new/testsuite/rsync.fns
888 @@ -66,7 +66,7 @@ printmsg() {
892 - find "$@" -print | sort | sed 's/ /\\ /g' | xargs "$TOOLDIR/tls"
893 + find "$@" -print | sort | sed 's/ /\\ /g' | xargs "$TOOLDIR/tls" $TLS_ARGS
897 @@ -184,6 +184,10 @@ checkit() {
898 # We can just write everything to stdout/stderr, because the
899 # wrapper hides it unless there is a problem.
901 + if test x$TLS_ARGS = x--atime; then
902 + ( cd "$2" && rsync_ls_lR . ) > "$tmpdir/ls-from"
905 echo "Running: \"$1\""
908 @@ -191,10 +195,13 @@ checkit() {
912 + if test x$TLS_ARGS != x--atime; then
913 + ( cd "$2" && rsync_ls_lR . ) > "$tmpdir/ls-from"
917 echo "check how the directory listings compare with diff:"
919 - ( cd "$2" && rsync_ls_lR . ) > "$tmpdir/ls-from"
920 ( cd "$3" && rsync_ls_lR . ) > "$tmpdir/ls-to"
921 diff $diffopt "$tmpdir/ls-from" "$tmpdir/ls-to" || failed=YES
931 #define PROGRAM "tls"
933 @@ -48,6 +49,7 @@ int read_only = 1;
935 int preserve_perms = 0;
937 +static int display_atime = 0;
939 static void failed(char const *what, char const *where)
941 @@ -56,14 +58,29 @@ static void failed(char const *what, cha
945 +static void storetime(char *dest, time_t t)
948 + struct tm *mt = gmtime(&t);
950 + sprintf(dest, "%04d-%02d-%02d %02d:%02d:%02d ",
951 + (int)mt->tm_year + 1900,
952 + (int)mt->tm_mon + 1,
962 static void list_file(const char *fname)
965 char permbuf[PERMSTRING_SIZE];
972 if (do_lstat(fname, &buf) < 0)
973 @@ -96,19 +113,8 @@ static void list_file(const char *fname)
975 permstring(permbuf, buf.st_mode);
977 - if (buf.st_mtime) {
978 - mt = gmtime(&buf.st_mtime);
980 - sprintf(datebuf, "%04d-%02d-%02d %02d:%02d:%02d",
981 - (int)mt->tm_year + 1900,
982 - (int)mt->tm_mon + 1,
988 - strcpy(datebuf, " ");
990 + storetime(mtimebuf, buf.st_mtime);
991 + storetime(atimebuf, buf.st_atime);
993 /* TODO: Perhaps escape special characters in fname? */
995 @@ -119,24 +125,55 @@ static void list_file(const char *fname)
996 (long)minor(buf.st_rdev));
997 } else /* NB: use double for size since it might not fit in a long. */
998 printf("%12.0f", (double)buf.st_size);
999 - printf(" %6ld.%-6ld %6ld %s %s%s\n",
1000 + printf(" %6ld.%-6ld %6ld %s%s%s%s\n",
1001 (long)buf.st_uid, (long)buf.st_gid, (long)buf.st_nlink,
1002 - datebuf, fname, linkbuf);
1003 + mtimebuf, display_atime && !S_ISDIR(buf.st_mode) ? atimebuf : "",
1007 +static struct poptOption long_options[] = {
1008 + /* longName, shortName, argInfo, argPtr, value, descrip, argDesc */
1009 + {"atime", 'u', POPT_ARG_NONE, &display_atime, 0, 0, 0},
1010 + {"help", 'h', POPT_ARG_NONE, 0, 'h', 0, 0},
1014 +static void tls_usage(int ret)
1016 + fprintf(stderr, "usage: " PROGRAM " [--atime | -u] DIR ...\n"
1017 + "Trivial file listing program for portably checking rsync\n");
1022 main(int argc, char *argv[])
1025 - fprintf(stderr, "usage: " PROGRAM " DIR ...\n"
1026 - "Trivial file listing program for portably checking rsync\n");
1029 + const char **extra_args;
1032 + pc = poptGetContext(PROGRAM, argc, (const char **)argv,
1034 + while ((opt = poptGetNextOpt(pc)) != -1) {
1041 + poptBadOption(pc, POPT_BADOPTION_NOALIAS),
1042 + poptStrerror(opt));
1047 - for (argv++; *argv; argv++) {
1050 + extra_args = poptGetArgs(pc);
1051 + if (*extra_args == NULL)
1054 + for (; *extra_args; extra_args++)
1055 + list_file(*extra_args);
1056 + poptFreeContext(pc);
1062 @@ -125,7 +125,7 @@ void overflow_exit(char *str)
1063 exit_cleanup(RERR_MALLOC);
1066 -int set_modtime(char *fname, time_t modtime, mode_t mode)
1067 +int set_times(char *fname, time_t modtime, time_t atime, mode_t mode)
1069 #if !defined HAVE_LUTIMES || !defined HAVE_UTIMES
1071 @@ -133,9 +133,13 @@ int set_modtime(char *fname, time_t modt
1075 - rprintf(FINFO, "set modtime of %s to (%ld) %s",
1076 + char mtimebuf[200];
1078 + strlcpy(mtimebuf, timestring(modtime), sizeof mtimebuf);
1080 + "set modtime, atime of %s to (%ld) %s, (%ld) %s\n",
1081 fname, (long)modtime,
1082 - asctime(localtime(&modtime)));
1083 + mtimebuf, (long)atime, timestring(atime));
1087 @@ -144,7 +148,7 @@ int set_modtime(char *fname, time_t modt
1090 struct timeval t[2];
1091 - t[0].tv_sec = time(NULL);
1092 + t[0].tv_sec = atime;
1094 t[1].tv_sec = modtime;
1096 @@ -155,12 +159,12 @@ int set_modtime(char *fname, time_t modt
1097 return utimes(fname, t);
1098 #elif defined HAVE_UTIMBUF
1099 struct utimbuf tbuf;
1100 - tbuf.actime = time(NULL);
1101 + tbuf.actime = atime;
1102 tbuf.modtime = modtime;
1103 return utime(fname,&tbuf);
1104 #elif defined HAVE_UTIME
1106 - t[0] = time(NULL);
1109 return utime(fname,t);