1 After applying this patch and running configure, you MUST run this
7 --- orig/flist.c 2006-01-31 02:30:18
8 +++ flist.c 2006-01-27 00:33:39
9 @@ -51,6 +51,7 @@ extern int preserve_devices;
10 extern int preserve_specials;
11 extern int preserve_uid;
12 extern int preserve_gid;
13 +extern int preserve_atimes;
14 extern int relative_paths;
15 extern int implied_dirs;
16 extern int prune_empty_dirs;
17 @@ -85,7 +86,13 @@ void init_flist(void)
20 /* Figure out how big the file_struct is without trailing padding */
21 - file_struct_len = offsetof(struct file_struct, flags) + sizeof f.flags;
22 + if (preserve_atimes)
23 + file_struct_len = offsetof(struct file_struct, fl4g5);
25 + file_struct_len = offsetof(struct file_struct, atime);
26 + /* The "flags" uchar is no longer accessed directly, so I
27 + * mangled the name to fl4g5 as a reminder. */
28 + file_struct_len += sizeof f.fl4g5;
29 checksum_len = protocol_version < 21 ? 2 : MD4_SUM_LENGTH;
32 @@ -141,16 +148,18 @@ static void list_file_entry(struct file_
35 if (preserve_links && S_ISLNK(f->mode)) {
36 - rprintf(FINFO, "%s %11.0f %s %s -> %s\n",
37 + rprintf(FINFO, "%s %11.0f %s %s %s -> %s\n",
39 (double)f->length, timestring(f->modtime),
40 + preserve_atimes ? timestring(f->atime) : "",
41 f_name(f, NULL), f->u.link);
45 - rprintf(FINFO, "%s %11.0f %s %s\n",
46 + rprintf(FINFO, "%s %11.0f %s %s %s\n",
48 (double)f->length, timestring(f->modtime),
49 + preserve_atimes ? timestring(f->atime) : "",
53 @@ -312,6 +321,7 @@ static void send_file_entry(struct file_
56 static time_t modtime;
57 + static time_t atime;
61 @@ -327,7 +337,7 @@ static void send_file_entry(struct file_
65 - modtime = 0, mode = 0;
66 + modtime = 0, atime = 0, mode = 0;
67 dev = 0, rdev = makedev(0, 0);
70 @@ -339,7 +349,7 @@ static void send_file_entry(struct file_
74 - flags = file->flags & XMIT_TOP_DIR;
75 + flags = FFLAGS(file) & XMIT_TOP_DIR;
77 if (file->mode == mode)
78 flags |= XMIT_SAME_MODE;
79 @@ -375,6 +385,12 @@ static void send_file_entry(struct file_
80 flags |= XMIT_SAME_TIME;
82 modtime = file->modtime;
83 + if (preserve_atimes && !S_ISDIR(mode)) {
84 + if (file->atime == atime)
85 + flags |= XMIT_SAME_ATIME;
87 + atime = file->atime;
90 #ifdef SUPPORT_HARD_LINKS
91 if (file->link_u.idev) {
92 @@ -428,6 +444,8 @@ static void send_file_entry(struct file_
93 write_int(f, modtime);
94 if (!(flags & XMIT_SAME_MODE))
95 write_int(f, to_wire_mode(mode));
96 + if (preserve_atimes && !S_ISDIR(mode) && !(flags & XMIT_SAME_ATIME))
97 + write_int(f, atime);
98 if (preserve_uid && !(flags & XMIT_SAME_UID)) {
101 @@ -496,6 +514,7 @@ static struct file_struct *receive_file_
102 unsigned short flags, int f)
104 static time_t modtime;
105 + static time_t atime;
109 @@ -514,7 +533,7 @@ static struct file_struct *receive_file_
110 struct file_struct *file;
113 - modtime = 0, mode = 0;
114 + modtime = 0, atime = 0, mode = 0;
115 dev = 0, rdev = makedev(0, 0);
118 @@ -570,6 +589,8 @@ static struct file_struct *receive_file_
119 modtime = (time_t)read_int(f);
120 if (!(flags & XMIT_SAME_MODE))
121 mode = from_wire_mode(read_int(f));
122 + if (preserve_atimes && !S_ISDIR(mode) && !(flags & XMIT_SAME_ATIME))
123 + atime = (time_t)read_int(f);
125 if (chmod_modes && !S_ISLNK(mode))
126 mode = tweak_mode(mode, chmod_modes);
127 @@ -625,6 +646,8 @@ static struct file_struct *receive_file_
131 + if (preserve_atimes)
132 + file->atime = atime;
135 file->dirname = lastdir = bp;
136 @@ -650,12 +673,12 @@ static struct file_struct *receive_file_
137 && lastname[del_hier_name_len-1] == '.'
138 && lastname[del_hier_name_len-2] == '/')
139 del_hier_name_len -= 2;
140 - file->flags |= FLAG_TOP_DIR | FLAG_DEL_HERE;
141 + FFLAGS(file) |= FLAG_TOP_DIR | FLAG_DEL_HERE;
142 } else if (in_del_hier) {
143 if (!relative_paths || !del_hier_name_len
144 || (l1 >= del_hier_name_len
145 && lastname[del_hier_name_len] == '/'))
146 - file->flags |= FLAG_DEL_HERE;
147 + FFLAGS(file) |= FLAG_DEL_HERE;
151 @@ -871,12 +894,14 @@ struct file_struct *make_file(char *fnam
152 memset(bp, 0, file_struct_len);
153 bp += file_struct_len;
155 - file->flags = flags;
156 + FFLAGS(file) = flags;
157 file->modtime = st.st_mtime;
158 file->length = st.st_size;
159 file->mode = st.st_mode;
160 file->uid = st.st_uid;
161 file->gid = st.st_gid;
162 + if (preserve_atimes)
163 + file->atime = st.st_atime;
165 #ifdef SUPPORT_HARD_LINKS
166 if (flist && flist->hlink_pool) {
167 @@ -989,7 +1014,7 @@ static void send_if_directory(int f, str
168 char is_dot_dir = fbuf[ol-1] == '.' && (ol == 1 || fbuf[ol-2] == '/');
170 if (S_ISDIR(file->mode)
171 - && !(file->flags & FLAG_MOUNT_POINT) && f_name(file, fbuf)) {
172 + && !(FFLAGS(file) & FLAG_MOUNT_POINT) && f_name(file, fbuf)) {
174 unsigned int len = strlen(fbuf);
175 if (len > 1 && fbuf[len-1] == '/')
176 @@ -1595,8 +1620,9 @@ static void clean_flist(struct file_list
178 /* Make sure we don't lose track of a user-specified
180 - flist->files[keep]->flags |= flist->files[drop]->flags
181 - & (FLAG_TOP_DIR|FLAG_DEL_HERE);
182 + FFLAGS(flist->files[keep])
183 + |= FFLAGS(flist->files[drop])
184 + & (FLAG_TOP_DIR|FLAG_DEL_HERE);
186 clear_file(flist->files[drop], flist);
188 @@ -1720,7 +1746,7 @@ static void output_flist(struct file_lis
189 file->dirname ? file->dirname : "",
190 file->dirname ? "/" : "", NS(file->basename),
191 S_ISDIR(file->mode) ? "/" : "", (int)file->mode,
192 - (double)file->length, uidbuf, gidbuf, file->flags);
193 + (double)file->length, uidbuf, gidbuf, FFLAGS(file));
197 --- orig/generator.c 2006-02-05 06:40:40
198 +++ generator.c 2006-02-01 19:37:52
199 @@ -44,6 +44,7 @@ extern int preserve_perms;
200 extern int preserve_uid;
201 extern int preserve_gid;
202 extern int preserve_times;
203 +extern int preserve_atimes;
204 extern int omit_dir_times;
205 extern int delete_mode;
206 extern int delete_before;
207 @@ -91,6 +92,7 @@ extern dev_t filesystem_dev;
208 extern char *backup_dir;
209 extern char *backup_suffix;
210 extern int backup_suffix_len;
211 +extern unsigned int file_struct_len;
212 extern struct file_list *the_file_list;
213 extern struct filter_list_struct server_filter_list;
215 @@ -185,7 +187,7 @@ static int delete_item(char *fname, int
216 for (j = dirlist->count; j--; ) {
217 struct file_struct *fp = dirlist->files[j];
219 - if (fp->flags & FLAG_MOUNT_POINT)
220 + if (FFLAGS(fp) & FLAG_MOUNT_POINT)
223 strlcpy(p, fp->basename, remainder);
224 @@ -263,7 +265,7 @@ static void delete_in_dir(struct file_li
225 filt_array[cur_depth] = push_local_filters(fbuf, dlen);
227 if (one_file_system) {
228 - if (file->flags & FLAG_TOP_DIR)
229 + if (FFLAGS(file) & FLAG_TOP_DIR)
230 filesystem_dev = stp->st_dev;
231 else if (filesystem_dev != stp->st_dev)
233 @@ -275,7 +277,7 @@ static void delete_in_dir(struct file_li
234 * from the filesystem. */
235 for (i = dirlist->count; i--; ) {
236 struct file_struct *fp = dirlist->files[i];
237 - if (!fp->basename || fp->flags & FLAG_MOUNT_POINT)
238 + if (!fp->basename || FFLAGS(fp) & FLAG_MOUNT_POINT)
240 if (flist_find(flist, fp) < 0) {
242 @@ -301,11 +303,11 @@ static void do_delete_pass(struct file_l
243 for (j = 0; j < flist->count; j++) {
244 struct file_struct *file = flist->files[j];
246 - if (!(file->flags & FLAG_DEL_HERE))
247 + if (!(FFLAGS(file) & FLAG_DEL_HERE))
251 - if (verbose > 1 && file->flags & FLAG_TOP_DIR)
252 + if (verbose > 1 && FFLAGS(file) & FLAG_TOP_DIR)
253 rprintf(FINFO, "deleting in %s\n", fbuf);
255 if (link_stat(fbuf, &st, keep_dirlinks) < 0
256 @@ -347,8 +349,11 @@ void itemize(struct file_struct *file, i
257 iflags |= ITEM_REPORT_SIZE;
258 if ((iflags & (ITEM_TRANSFER|ITEM_LOCAL_CHANGE) && !keep_time
259 && (!(iflags & ITEM_XNAME_FOLLOWS) || *xname))
260 - || (keep_time && cmp_modtime(file->modtime, st->st_mtime) != 0))
261 + || (keep_time && cmp_time(file->modtime, st->st_mtime) != 0))
262 iflags |= ITEM_REPORT_TIME;
263 + if (preserve_atimes && !S_ISDIR(file->mode) && !S_ISLNK(file->mode)
264 + && cmp_time(file->atime, st->st_atime) != 0)
265 + iflags |= ITEM_REPORT_ATIME;
266 if ((file->mode & CHMOD_BITS) != (st->st_mode & CHMOD_BITS))
267 iflags |= ITEM_REPORT_PERMS;
268 if (preserve_uid && am_root && file->uid != st->st_uid)
269 @@ -396,7 +401,7 @@ int unchanged_file(char *fn, struct file
273 - return cmp_modtime(st->st_mtime, file->modtime) == 0;
274 + return cmp_time(st->st_mtime, file->modtime) == 0;
278 @@ -550,13 +555,13 @@ static int find_fuzzy(struct file_struct
281 if (!S_ISREG(fp->mode) || !fp->length
282 - || fp->flags & FLAG_NO_FUZZY)
283 + || FFLAGS(fp) & FLAG_NO_FUZZY)
288 if (fp->length == file->length
289 - && cmp_modtime(fp->modtime, file->modtime) == 0) {
290 + && cmp_time(fp->modtime, file->modtime) == 0) {
293 "fuzzy size/modtime match for %s\n",
294 @@ -632,7 +637,7 @@ static int try_dests_reg(struct file_str
295 if (!unchanged_attrs(file, stp))
297 if ((always_checksum || ignore_times)
298 - && cmp_modtime(stp->st_mtime, file->modtime))
299 + && cmp_time(stp->st_mtime, file->modtime))
303 @@ -659,6 +664,8 @@ static int try_dests_reg(struct file_str
304 itemizing && verbose > 1,
307 + if (preserve_atimes)
308 + set_file_attrs(fname, file, stp, 0);
309 if (preserve_hard_links && file->link_u.links)
310 hard_link_cluster(file, ndx, itemizing, code);
311 } else if (itemizing)
312 @@ -894,7 +901,7 @@ static void recv_generator(char *fname,
313 && verbose && code && f_out != -1)
314 rprintf(code, "%s/\n", fname);
315 if (delete_during && f_out != -1 && !phase && dry_run < 2
316 - && (file->flags & FLAG_DEL_HERE))
317 + && (FFLAGS(file) & FLAG_DEL_HERE))
318 delete_in_dir(the_file_list, fname, file, &st);
321 @@ -1073,7 +1080,7 @@ static void recv_generator(char *fname,
324 if (update_only && statret == 0
325 - && cmp_modtime(st.st_mtime, file->modtime) > 0) {
326 + && cmp_time(st.st_mtime, file->modtime) > 0) {
328 rprintf(FINFO, "%s is newer\n", fname);
330 @@ -1176,7 +1183,7 @@ static void recv_generator(char *fname,
332 int j = flist_find(fuzzy_dirlist, file);
333 if (j >= 0) /* don't use changing file as future fuzzy basis */
334 - fuzzy_dirlist->files[j]->flags |= FLAG_NO_FUZZY;
335 + FFLAGS(fuzzy_dirlist->files[j]) |= FLAG_NO_FUZZY;
339 --- orig/hlink.c 2006-01-14 20:27:09
340 +++ hlink.c 2006-01-24 19:17:58
341 @@ -26,6 +26,7 @@ extern int link_dest;
342 extern int make_backups;
343 extern int log_format_has_i;
344 extern char *basis_dir[];
345 +extern unsigned int file_struct_len;
346 extern struct file_list *the_file_list;
348 #ifdef SUPPORT_HARD_LINKS
349 @@ -86,10 +87,10 @@ static void link_idev_data(void)
350 FPTR(cur)->link_u.links = pool_talloc(hlink_pool,
351 struct hlink, 1, "hlink_list");
353 - FPTR(head)->flags |= FLAG_HLINK_TOL;
354 + FFLAGS(FPTR(head)) |= FLAG_HLINK_TOL;
355 FPTR(cur)->F_HLINDEX = to;
356 FPTR(cur)->F_NEXT = head;
357 - FPTR(cur)->flags |= FLAG_HLINK_EOL;
358 + FFLAGS(FPTR(cur)) |= FLAG_HLINK_EOL;
359 hlink_list[to++] = head;
361 FPTR(cur)->link_u.links = NULL;
362 @@ -175,7 +176,7 @@ int hard_link_check(struct file_struct *
364 #ifdef SUPPORT_HARD_LINKS
366 - if (skip && !(file->flags & FLAG_HLINK_EOL))
367 + if (skip && !(FFLAGS(file) & FLAG_HLINK_EOL))
368 head = hlink_list[file->F_HLINDEX] = file->F_NEXT;
370 head = hlink_list[file->F_HLINDEX];
371 @@ -270,8 +271,8 @@ void hard_link_cluster(struct file_struc
372 file->F_HLINDEX = FINISHED_LINK;
373 if (link_stat(f_name(file, hlink1), &st1, 0) < 0)
375 - if (!(file->flags & FLAG_HLINK_TOL)) {
376 - while (!(file->flags & FLAG_HLINK_EOL)) {
377 + if (!(FFLAGS(file) & FLAG_HLINK_TOL)) {
378 + while (!(FFLAGS(file) & FLAG_HLINK_EOL)) {
382 @@ -286,6 +287,6 @@ void hard_link_cluster(struct file_struc
383 maybe_hard_link(file, ndx, hlink2, statret, &st2,
384 hlink1, &st1, itemizing, code);
385 file->F_HLINDEX = FINISHED_LINK;
386 - } while (!(file->flags & FLAG_HLINK_EOL));
387 + } while (!(FFLAGS(file) & FLAG_HLINK_EOL));
390 --- orig/log.c 2006-02-05 04:53:34
391 +++ log.c 2006-01-24 22:50:01
392 @@ -41,6 +41,7 @@ extern int module_id;
393 extern int msg_fd_out;
394 extern int protocol_version;
395 extern int preserve_times;
396 +extern int preserve_atimes;
397 extern int log_format_has_i;
398 extern int log_format_has_o_or_i;
399 extern int daemon_log_format_has_o_or_i;
400 @@ -607,10 +608,12 @@ static void log_formatted(enum logcode c
401 n[3] = !(iflags & ITEM_REPORT_SIZE) ? '.' : 's';
402 n[4] = !(iflags & ITEM_REPORT_TIME) ? '.'
403 : !preserve_times || S_ISLNK(file->mode) ? 'T' : 't';
404 - n[5] = !(iflags & ITEM_REPORT_PERMS) ? '.' : 'p';
405 - n[6] = !(iflags & ITEM_REPORT_OWNER) ? '.' : 'o';
406 - n[7] = !(iflags & ITEM_REPORT_GROUP) ? '.' : 'g';
408 + n[5] = !(iflags & ITEM_REPORT_ATIME) ? '.'
409 + : S_ISLNK(file->mode) ? 'U' : 'u';
410 + n[6] = !(iflags & ITEM_REPORT_PERMS) ? '.' : 'p';
411 + n[7] = !(iflags & ITEM_REPORT_OWNER) ? '.' : 'o';
412 + n[8] = !(iflags & ITEM_REPORT_GROUP) ? '.' : 'g';
415 if (iflags & (ITEM_IS_NEW|ITEM_MISSING_DATA)) {
416 char ch = iflags & ITEM_IS_NEW ? '+' : '?';
417 --- orig/options.c 2006-02-03 23:51:57
418 +++ options.c 2006-01-31 03:08:39
419 @@ -52,6 +52,7 @@ int preserve_uid = 0;
420 int preserve_gid = 0;
421 int preserve_times = 0;
422 int omit_dir_times = 0;
423 +int preserve_atimes = 0;
427 @@ -299,8 +300,9 @@ void usage(enum logcode F)
428 rprintf(F," --devices preserve device files (super-user only)\n");
429 rprintf(F," --specials preserve special files\n");
430 rprintf(F," -D same as --devices --specials\n");
431 - rprintf(F," -t, --times preserve times\n");
432 - rprintf(F," -O, --omit-dir-times omit directories when preserving times\n");
433 + rprintf(F," -t, --times preserve modify times\n");
434 + rprintf(F," -O, --omit-dir-times omit directories when preserving modify times\n");
435 + rprintf(F," -U, --atimes preserve access (use) times\n");
436 rprintf(F," --super receiver attempts super-user activities\n");
437 rprintf(F," -S, --sparse handle sparse files efficiently\n");
438 rprintf(F," -n, --dry-run show what would have been transferred\n");
439 @@ -412,6 +414,9 @@ static struct poptOption long_options[]
440 {"times", 't', POPT_ARG_VAL, &preserve_times, 1, 0, 0 },
441 {"no-times", 0, POPT_ARG_VAL, &preserve_times, 0, 0, 0 },
442 {"no-t", 0, POPT_ARG_VAL, &preserve_times, 0, 0, 0 },
443 + {"atimes", 'U', POPT_ARG_VAL, &preserve_atimes, 1, 0, 0 },
444 + {"no-atimes", 0, POPT_ARG_VAL, &preserve_atimes, 0, 0, 0 },
445 + {"no-k", 0, POPT_ARG_VAL, &preserve_atimes, 0, 0, 0 },
446 {"omit-dir-times", 'O', POPT_ARG_VAL, &omit_dir_times, 2, 0, 0 },
447 {"modify-window", 0, POPT_ARG_INT, &modify_window, OPT_MODIFY_WINDOW, 0, 0 },
448 {"super", 0, POPT_ARG_VAL, &am_root, 2, 0, 0 },
449 @@ -1505,6 +1510,8 @@ void server_options(char **args,int *arg
453 + if (preserve_atimes)
457 else if (preserve_executability && am_sender)
458 --- orig/rsync.c 2006-02-05 04:53:34
459 +++ rsync.c 2006-01-31 03:00:22
460 @@ -37,6 +37,7 @@ extern int preserve_perms;
461 extern int preserve_executability;
462 extern int preserve_times;
463 extern int omit_dir_times;
464 +extern int preserve_atimes;
465 extern int orig_umask;
467 extern int am_server;
468 @@ -113,6 +114,7 @@ int set_file_attrs(char *fname, struct f
471 int change_uid, change_gid;
472 + time_t atime, mtime;
476 @@ -131,18 +133,33 @@ int set_file_attrs(char *fname, struct f
480 + /* This code must be the first update in the function due to
481 + * how it uses the "updated" variable. */
482 if (!preserve_times || (S_ISDIR(st->st_mode) && omit_dir_times))
483 flags |= ATTRS_SKIP_MTIME;
484 + if (!preserve_atimes || S_ISDIR(st->st_mode))
485 + flags |= ATTRS_SKIP_ATIME;
486 if (!(flags & ATTRS_SKIP_MTIME)
487 - && cmp_modtime(st->st_mtime, file->modtime) != 0) {
488 - int ret = set_modtime(fname, file->modtime, st->st_mode);
489 + && cmp_time(st->st_mtime, file->modtime) != 0) {
490 + mtime = file->modtime;
493 + mtime = st->st_mtime;
494 + if (!(flags & ATTRS_SKIP_ATIME)
495 + && cmp_time(st->st_atime, file->atime) != 0) {
496 + atime = file->atime;
499 + atime = st->st_atime;
501 + int ret = set_times(fname, mtime, atime, st->st_mode);
503 rsyserr(FERROR, errno, "failed to set times on %s",
507 - if (ret == 0) /* ret == 1 if symlink could not be set */
509 + if (ret > 0) /* ret == 1 if symlink could not be set */
513 change_uid = am_root && preserve_uid && st->st_uid != file->uid;
514 --- orig/rsync.h 2006-02-03 20:00:36
515 +++ rsync.h 2006-01-24 22:38:08
517 #define XMIT_HAS_IDEV_DATA (1<<9)
518 #define XMIT_SAME_DEV (1<<10)
519 #define XMIT_RDEV_MINOR_IS_SMALL (1<<11)
520 +#define XMIT_SAME_ATIME (1<<12)
522 /* These flags are used in the live flist data. */
526 #define ATTRS_REPORT (1<<0)
527 #define ATTRS_SKIP_MTIME (1<<1)
528 +#define ATTRS_SKIP_ATIME (1<<2)
531 #define NORMAL_FLUSH 0
533 #define FNAMECMP_FUZZY 0x83
535 /* For use by the itemize_changes code */
536 +#define ITEM_REPORT_ATIME (1<<0)
537 #define ITEM_REPORT_CHECKSUM (1<<1)
538 #define ITEM_REPORT_SIZE (1<<2)
539 #define ITEM_REPORT_TIME (1<<3)
540 @@ -520,9 +523,12 @@ struct file_struct {
544 - uchar flags; /* this item MUST remain last */
545 + time_t atime; /* this MUST be second to last */
546 + uchar fl4g5; /* this item MUST remain last */
549 +#define FFLAGS(f) ((uchar*)(f))[file_struct_len-1]
552 * Start the flist array at FLIST_START entries and grow it
553 * by doubling until FLIST_LINEAR then grow by FLIST_LINEAR
554 --- orig/rsync.yo 2006-02-05 06:58:50
555 +++ rsync.yo 2006-01-31 03:06:45
556 @@ -323,8 +323,9 @@ to the detailed description below for a
557 --devices preserve device files (super-user only)
558 --specials preserve special files
559 -D same as --devices --specials
560 - -t, --times preserve times
561 - -O, --omit-dir-times omit directories when preserving times
562 + -t, --times preserve modify times
563 + -O, --omit-dir-times omit directories when preserving mod-times
564 + -U, --atimes preserve access (use) times
565 --super receiver attempts super-user activities
566 -S, --sparse handle sparse files efficiently
567 -n, --dry-run show what would have been transferred
568 @@ -796,6 +797,12 @@ it is preserving modification times (see
569 the directories on the receiving side, it is a good idea to use bf(-O).
570 This option is inferred if you use bf(--backup) without bf(--backup-dir).
572 +dit(bf(-U, --atimes)) This tells rsync to set the access (use) times of the
573 +destination files to the same value as the source files. Note that the
574 +reading of the source file may update the atime of the source files, so
575 +repeated rsync runs with --atimes may be needed if you want to force the
576 +access-time values to be 100% identical on the two systems.
578 dit(bf(--super)) This tells the receiving side to attempt super-user
579 activities even if the receiving rsync wasn't run by the super-user. These
580 activities include: preserving users via the bf(--owner) option, preserving
581 @@ -1303,8 +1310,8 @@ if the receiving rsync is at least versi
582 with older versions of rsync, but that also turns on the output of other
585 -The "%i" escape has a cryptic output that is 8 letters long. The general
586 -format is like the string bf(YXcstpog), where bf(Y) is replaced by the
587 +The "%i" escape has a cryptic output that is 9 letters long. The general
588 +format is like the string bf(YXcstupog), where bf(Y) is replaced by the
589 kind of update being done, bf(X) is replaced by the file-type, and the
590 other letters represent attributes that may be output if they are being
592 @@ -1344,9 +1351,13 @@ quote(itemize(
593 by the file transfer.
594 it() A bf(t) means the modification time is different and is being updated
595 to the sender's value (requires bf(--times)). An alternate value of bf(T)
596 - means that the time will be set to the transfer time, which happens
597 + means that the modify time will be set to the transfer time, which happens
598 anytime a symlink is transferred, or when a file or device is transferred
600 + it() A bf(u) means the access (use) time is different and is being updated to
601 + the sender's value (requires bf(--atimes)). An alternate value of bf(U)
602 + means that the access time will be set to the transfer time, which happens
603 + anytime a symlink is transferred.
604 it() A bf(p) means the permissions are different and are being updated to
605 the sender's value (requires bf(--perms)).
606 it() An bf(o) means the owner is different and is being updated to the
607 --- orig/sender.c 2006-01-14 20:27:10
608 +++ sender.c 2006-01-24 18:10:23
609 @@ -38,6 +38,7 @@ extern int do_progress;
612 extern int write_batch;
613 +extern unsigned int file_struct_len;
614 extern struct stats stats;
615 extern struct file_list *the_file_list;
616 extern char *log_format;
617 @@ -126,7 +127,7 @@ void successful_send(int ndx)
619 file = the_file_list->files[ndx];
620 /* The generator might tell us about symlinks we didn't send. */
621 - if (!(file->flags & FLAG_SENT) && !S_ISLNK(file->mode))
622 + if (!(FFLAGS(file) & FLAG_SENT) && !S_ISLNK(file->mode))
624 if (file->dir.root) {
625 offset = stringjoin(fname, sizeof fname,
626 @@ -370,7 +371,7 @@ void send_files(struct file_list *flist,
627 rprintf(FINFO, "sender finished %s\n", fname);
629 /* Flag that we actually sent this entry. */
630 - file->flags |= FLAG_SENT;
631 + FFLAGS(file) |= FLAG_SENT;
633 make_backups = save_make_backups;
635 --- orig/testsuite/atimes.test 2006-01-24 22:54:53
636 +++ testsuite/atimes.test 2006-01-24 22:54:53
640 +# Test rsync copying atimes
642 +. "$suitedir/rsync.fns"
648 +touch "$fromdir/foo"
649 +touch -a -t 200102031717.42 "$fromdir/foo"
653 +checkit "$RSYNC -rtUgvvv \"$fromdir/\" \"$todir/\"" "$fromdir" "$todir"
655 +# The script would have aborted on error, so getting here means we've won.
657 --- orig/testsuite/devices.test 2006-01-30 08:12:44
658 +++ testsuite/devices.test 2006-01-26 10:53:43
659 @@ -42,14 +42,14 @@ touch -r "$fromdir/block" "$fromdir/bloc
660 $RSYNC -ai "$fromdir/block" "$todir/block2" \
662 cat <<EOT >"$chkfile"
666 diff $diffopt "$chkfile" "$outfile" || test_fail "test 1 failed"
668 $RSYNC -ai "$fromdir/block2" "$todir/block" \
670 cat <<EOT >"$chkfile"
674 diff $diffopt "$chkfile" "$outfile" || test_fail "test 2 failed"
676 @@ -58,7 +58,7 @@ sleep 1
677 $RSYNC -Di "$fromdir/block3" "$todir/block" \
679 cat <<EOT >"$chkfile"
683 diff $diffopt "$chkfile" "$outfile" || test_fail "test 3 failed"
685 @@ -66,15 +66,15 @@ $RSYNC -aiHvv "$fromdir/" "$todir/" \
688 cat <<EOT >"$chkfile"
693 -hD++++++ block2.5 => block3
702 +hD+++++++ block2.5 => block3
708 if test ! -b "$fromdir/block2.5"; then
709 sed -e '/block2\.5/d' \
710 --- orig/testsuite/itemize.test 2006-02-04 19:52:05
711 +++ testsuite/itemize.test 2006-01-24 22:32:03
712 @@ -29,14 +29,14 @@ ln "$fromdir/foo/config1" "$fromdir/foo/
713 $RSYNC -iplr "$fromdir/" "$todir/" \
715 cat <<EOT >"$chkfile"
718 ->f++++++ bar/baz/rsync
720 ->f++++++ foo/config1
721 ->f++++++ foo/config2
723 -cL++++++ foo/sym -> ../bar/baz/rsync
726 +>f+++++++ bar/baz/rsync
728 +>f+++++++ foo/config1
729 +>f+++++++ foo/config2
731 +cL+++++++ foo/sym -> ../bar/baz/rsync
733 diff $diffopt "$chkfile" "$outfile" || test_fail "test 1 failed"
735 @@ -48,10 +48,10 @@ chmod 601 "$fromdir/foo/config2"
736 $RSYNC -iplrH "$fromdir/" "$todir/" \
738 cat <<EOT >"$chkfile"
739 ->f..T... bar/baz/rsync
740 ->f..T... foo/config1
741 ->f.sTp.. foo/config2
742 -hf..T... foo/extra => foo/config1
743 +>f..T.... bar/baz/rsync
744 +>f..T.... foo/config1
745 +>f.sT.p.. foo/config2
746 +hf..T.... foo/extra => foo/config1
748 diff $diffopt "$chkfile" "$outfile" || test_fail "test 2 failed"
750 @@ -68,11 +68,11 @@ chmod 777 "$todir/bar/baz/rsync"
751 $RSYNC -iplrtc "$fromdir/" "$todir/" \
753 cat <<EOT >"$chkfile"
754 -.f..tp.. bar/baz/rsync
756 -.f..t... foo/config1
757 ->fcstp.. foo/config2
758 -cL..T... foo/sym -> ../bar/baz/rsync
759 +.f..t.p.. bar/baz/rsync
761 +.f..t.... foo/config1
762 +>fcst.p.. foo/config2
763 +cL..T.... foo/sym -> ../bar/baz/rsync
765 diff $diffopt "$chkfile" "$outfile" || test_fail "test 3 failed"
767 @@ -97,15 +97,15 @@ $RSYNC -ivvplrtH "$fromdir/" "$todir/" \
770 cat <<EOT >"$chkfile"
774 -.f...p.. bar/baz/rsync
777 ->f..t... foo/config2
779 -.L foo/sym -> ../bar/baz/rsync
783 +.f....p.. bar/baz/rsync
786 +>f..t.... foo/config2
788 +.L foo/sym -> ../bar/baz/rsync
790 diff $diffopt "$chkfile" "$outfile" || test_fail "test 5 failed"
792 @@ -124,8 +124,8 @@ touch "$todir/foo/config2"
793 $RSYNC -iplrtH "$fromdir/" "$todir/" \
795 cat <<EOT >"$chkfile"
796 -.f...p.. foo/config1
797 ->f..t... foo/config2
798 +.f....p.. foo/config1
799 +>f..t.... foo/config2
801 diff $diffopt "$chkfile" "$outfile" || test_fail "test 7 failed"
803 @@ -134,15 +134,15 @@ $RSYNC -ivvplrtH --copy-dest="$lddir" "$
806 cat <<EOT >"$chkfile"
814 -hf foo/extra => foo/config1
815 -cL..T... foo/sym -> ../bar/baz/rsync
823 +hf foo/extra => foo/config1
824 +cL..T.... foo/sym -> ../bar/baz/rsync
826 diff $diffopt "$chkfile" "$outfile" || test_fail "test 8 failed"
828 @@ -150,11 +150,11 @@ rm -rf "$todir"
829 $RSYNC -iplrtH --copy-dest="$lddir" "$fromdir/" "$todir/" \
831 cat <<EOT >"$chkfile"
836 -hf foo/extra => foo/config1
841 +hf foo/extra => foo/config1
843 diff $diffopt "$chkfile" "$outfile" || test_fail "test 9 failed"
845 @@ -181,15 +181,15 @@ $RSYNC -ivvplrtH --link-dest="$lddir" "$
848 cat <<EOT >"$chkfile"
856 -hf foo/extra => foo/config1
857 -hL foo/sym -> ../bar/baz/rsync
865 +hf foo/extra => foo/config1
866 +hL foo/sym -> ../bar/baz/rsync
868 diff $diffopt "$chkfile" "$outfile" || test_fail "test 11 failed"
870 @@ -197,10 +197,10 @@ rm -rf "$todir"
871 $RSYNC -iplrtH --link-dest="$lddir" "$fromdir/" "$todir/" \
873 cat <<EOT >"$chkfile"
883 diff $diffopt "$chkfile" "$outfile" || test_fail "test 12 failed"
885 @@ -228,14 +228,14 @@ filter_outfile
886 # TODO fix really-old problem when combining -H with --compare-dest:
887 # missing output for foo/extra hard-link (and it might not be updated)!
888 cat <<EOT >"$chkfile"
896 -.L foo/sym -> ../bar/baz/rsync
904 +.L foo/sym -> ../bar/baz/rsync
906 diff $diffopt "$chkfile" "$outfile" || test_fail "test 14 failed"
908 @@ -243,10 +243,10 @@ rm -rf "$todir"
909 $RSYNC -iplrtH --compare-dest="$lddir" "$fromdir/" "$todir/" \
911 cat <<EOT >"$chkfile"
921 diff $diffopt "$chkfile" "$outfile" || test_fail "test 15 failed"
923 --- orig/testsuite/rsync.fns 2006-02-04 19:52:05
924 +++ testsuite/rsync.fns 2005-07-28 00:41:20
925 @@ -66,7 +66,7 @@ printmsg() {
929 - find "$@" -print | sort | sed 's/ /\\ /g' | xargs "$TOOLDIR/tls"
930 + find "$@" -print | sort | sed 's/ /\\ /g' | xargs "$TOOLDIR/tls" $TLS_ARGS
934 @@ -184,6 +184,10 @@ checkit() {
935 # We can just write everything to stdout/stderr, because the
936 # wrapper hides it unless there is a problem.
938 + if test x$TLS_ARGS = x--atime; then
939 + ( cd "$2" && rsync_ls_lR . ) > "$tmpdir/ls-from"
942 echo "Running: \"$1\""
945 @@ -191,10 +195,13 @@ checkit() {
949 + if test x$TLS_ARGS != x--atime; then
950 + ( cd "$2" && rsync_ls_lR . ) > "$tmpdir/ls-from"
954 echo "check how the directory listings compare with diff:"
956 - ( cd "$2" && rsync_ls_lR . ) > "$tmpdir/ls-from"
957 ( cd "$3" && rsync_ls_lR . ) > "$tmpdir/ls-to"
958 diff $diffopt "$tmpdir/ls-from" "$tmpdir/ls-to" || failed=YES
960 --- orig/tls.c 2005-09-24 17:40:31
961 +++ tls.c 2005-03-23 17:49:48
968 #define PROGRAM "tls"
970 @@ -48,6 +49,7 @@ int read_only = 1;
972 int preserve_perms = 0;
974 +static int display_atime = 0;
976 static void failed(char const *what, char const *where)
978 @@ -56,14 +58,29 @@ static void failed(char const *what, cha
982 +static void storetime(char *dest, time_t t)
985 + struct tm *mt = gmtime(&t);
987 + sprintf(dest, "%04d-%02d-%02d %02d:%02d:%02d ",
988 + (int)mt->tm_year + 1900,
989 + (int)mt->tm_mon + 1,
999 static void list_file(const char *fname)
1002 char permbuf[PERMSTRING_SIZE];
1005 + char mtimebuf[50];
1006 + char atimebuf[50];
1009 if (do_lstat(fname, &buf) < 0)
1010 @@ -96,19 +113,8 @@ static void list_file(const char *fname)
1012 permstring(permbuf, buf.st_mode);
1014 - if (buf.st_mtime) {
1015 - mt = gmtime(&buf.st_mtime);
1017 - sprintf(datebuf, "%04d-%02d-%02d %02d:%02d:%02d",
1018 - (int)mt->tm_year + 1900,
1019 - (int)mt->tm_mon + 1,
1025 - strcpy(datebuf, " ");
1027 + storetime(mtimebuf, buf.st_mtime);
1028 + storetime(atimebuf, buf.st_atime);
1030 /* TODO: Perhaps escape special characters in fname? */
1032 @@ -119,24 +125,55 @@ static void list_file(const char *fname)
1033 (long)minor(buf.st_rdev));
1034 } else /* NB: use double for size since it might not fit in a long. */
1035 printf("%12.0f", (double)buf.st_size);
1036 - printf(" %6ld.%-6ld %6ld %s %s%s\n",
1037 + printf(" %6ld.%-6ld %6ld %s%s%s%s\n",
1038 (long)buf.st_uid, (long)buf.st_gid, (long)buf.st_nlink,
1039 - datebuf, fname, linkbuf);
1040 + mtimebuf, display_atime && !S_ISDIR(buf.st_mode) ? atimebuf : "",
1044 +static struct poptOption long_options[] = {
1045 + /* longName, shortName, argInfo, argPtr, value, descrip, argDesc */
1046 + {"atime", 'u', POPT_ARG_NONE, &display_atime, 0, 0, 0},
1047 + {"help", 'h', POPT_ARG_NONE, 0, 'h', 0, 0},
1051 +static void tls_usage(int ret)
1053 + fprintf(stderr, "usage: " PROGRAM " [--atime | -u] DIR ...\n"
1054 + "Trivial file listing program for portably checking rsync\n");
1059 main(int argc, char *argv[])
1062 - fprintf(stderr, "usage: " PROGRAM " DIR ...\n"
1063 - "Trivial file listing program for portably checking rsync\n");
1066 + const char **extra_args;
1069 + pc = poptGetContext(PROGRAM, argc, (const char **)argv,
1071 + while ((opt = poptGetNextOpt(pc)) != -1) {
1078 + poptBadOption(pc, POPT_BADOPTION_NOALIAS),
1079 + poptStrerror(opt));
1084 - for (argv++; *argv; argv++) {
1087 + extra_args = poptGetArgs(pc);
1088 + if (*extra_args == NULL)
1091 + for (; *extra_args; extra_args++)
1092 + list_file(*extra_args);
1093 + poptFreeContext(pc);
1097 --- orig/util.c 2006-02-03 20:00:36
1098 +++ util.c 2006-01-14 08:20:29
1099 @@ -130,7 +130,7 @@ void overflow_exit(char *str)
1103 -int set_modtime(char *fname, time_t modtime, mode_t mode)
1104 +int set_times(char *fname, time_t modtime, time_t atime, mode_t mode)
1106 #if !defined HAVE_LUTIMES || !defined HAVE_UTIMES
1108 @@ -138,9 +138,13 @@ int set_modtime(char *fname, time_t modt
1112 - rprintf(FINFO, "set modtime of %s to (%ld) %s",
1113 + char mtimebuf[200];
1115 + strlcpy(mtimebuf, timestring(modtime), sizeof mtimebuf);
1117 + "set modtime, atime of %s to (%ld) %s, (%ld) %s\n",
1118 fname, (long)modtime,
1119 - asctime(localtime(&modtime)));
1120 + mtimebuf, (long)atime, timestring(atime));
1124 @@ -149,7 +153,7 @@ int set_modtime(char *fname, time_t modt
1127 struct timeval t[2];
1128 - t[0].tv_sec = time(NULL);
1129 + t[0].tv_sec = atime;
1131 t[1].tv_sec = modtime;
1133 @@ -160,12 +164,12 @@ int set_modtime(char *fname, time_t modt
1134 return utimes(fname, t);
1135 #elif defined HAVE_UTIMBUF
1136 struct utimbuf tbuf;
1137 - tbuf.actime = time(NULL);
1138 + tbuf.actime = atime;
1139 tbuf.modtime = modtime;
1140 return utime(fname,&tbuf);
1141 #elif defined HAVE_UTIME
1143 - t[0] = time(NULL);
1146 return utime(fname,t);
1148 @@ -1183,8 +1187,8 @@ int msleep(int t)
1152 - * Determine if two file modification times are equivalent (either
1153 - * exact or in the modification timestamp window established by
1154 + * Determine if two file times are equivalent (either
1155 + * exact or in the timestamp window established by
1158 * @retval 0 if the times should be treated as the same
1159 @@ -1193,7 +1197,7 @@ int msleep(int t)
1161 * @retval -1 if the 2nd is later
1163 -int cmp_modtime(time_t file1, time_t file2)
1164 +int cmp_time(time_t file1, time_t file2)
1166 if (file2 > file1) {
1167 if (file2 - file1 <= modify_window)