-After applying this patch and running configure, you MUST run this
-command before "make":
+After applying this patch, run these commands for a successful build:
- make proto
+ ./prepare-source
+ ./configure (optional if already run)
+ make
---- orig/batch.c 2004-08-02 05:02:24
-+++ batch.c 2004-07-03 20:15:41
-@@ -184,6 +184,8 @@ void show_flist(int index, struct file_s
- rprintf(FINFO, "flist->flags=%#x\n", fptr[i]->flags);
- rprintf(FINFO, "flist->modtime=%#lx\n",
- (long unsigned) fptr[i]->modtime);
-+ rprintf(FINFO, "flist->atime=%#lx\n",
-+ (long unsigned) fptr[i]->atime);
- rprintf(FINFO, "flist->length=%.0f\n",
- (double) fptr[i]->length);
- rprintf(FINFO, "flist->mode=%#o\n", (int) fptr[i]->mode);
---- orig/flist.c 2004-08-11 23:42:23
-+++ flist.c 2004-07-03 20:15:41
-@@ -58,6 +58,7 @@ extern int relative_paths;
+--- old/flist.c
++++ new/flist.c
+@@ -51,6 +51,7 @@ extern int preserve_devices;
+ extern int preserve_specials;
+ extern int preserve_uid;
+ extern int preserve_gid;
++extern int preserve_atimes;
+ extern int relative_paths;
extern int implied_dirs;
- extern int copy_links;
- extern int copy_unsafe_links;
-+extern int copy_atimes;
- extern int protocol_version;
- extern int sanitize_paths;
- extern int delete_excluded;
-@@ -141,17 +142,17 @@ static void list_file_entry(struct file_
+ extern int prune_empty_dirs;
+@@ -85,7 +86,13 @@ void init_flist(void)
+ struct file_struct f;
+
+ /* Figure out how big the file_struct is without trailing padding */
+- file_struct_len = offsetof(struct file_struct, flags) + sizeof f.flags;
++ if (preserve_atimes)
++ file_struct_len = offsetof(struct file_struct, fl4g5);
++ else
++ file_struct_len = offsetof(struct file_struct, atime);
++ /* The "flags" uchar is no longer accessed directly, so I
++ * mangled the name to fl4g5 as a reminder. */
++ file_struct_len += sizeof f.fl4g5;
+ checksum_len = protocol_version < 21 ? 2 : MD4_SUM_LENGTH;
+ }
- #if SUPPORT_LINKS
+@@ -141,16 +148,18 @@ static void list_file_entry(struct file_
+
+ #ifdef SUPPORT_LINKS
if (preserve_links && S_ISLNK(f->mode)) {
- rprintf(FINFO, "%s %11.0f %s %s -> %s\n",
+ rprintf(FINFO, "%s %11.0f %s %s %s -> %s\n",
- perms,
+ permbuf,
(double)f->length, timestring(f->modtime),
-- f_name(f), f->u.link);
-+ timestring(f->atime), f_name(f), f->u.link);
++ preserve_atimes ? timestring(f->atime) : "",
+ f_name(f, NULL), f->u.link);
} else
#endif
{
- rprintf(FINFO, "%s %11.0f %s %s\n",
+ rprintf(FINFO, "%s %11.0f %s %s %s\n",
- perms,
+ permbuf,
(double)f->length, timestring(f->modtime),
-- f_name(f));
-+ timestring(f->atime), f_name(f));
++ preserve_atimes ? timestring(f->atime) : "",
+ f_name(f, NULL));
}
}
-
-@@ -332,6 +333,7 @@ void send_file_entry(struct file_struct
+@@ -312,6 +321,7 @@ static void send_file_entry(struct file_
{
unsigned short flags;
static time_t modtime;
+ static time_t atime;
static mode_t mode;
- static uint64 dev;
+ static int64 dev;
static dev_t rdev;
-@@ -347,7 +349,7 @@ void send_file_entry(struct file_struct
+@@ -327,7 +337,7 @@ static void send_file_entry(struct file_
if (!file) {
write_byte(f, 0);
dev = 0, rdev = makedev(0, 0);
rdev_major = 0;
uid = 0, gid = 0;
-@@ -396,6 +398,12 @@ void send_file_entry(struct file_struct
+@@ -339,7 +349,7 @@ static void send_file_entry(struct file_
+
+ f_name(file, fname);
+
+- flags = file->flags & XMIT_TOP_DIR;
++ flags = FFLAGS(file) & XMIT_TOP_DIR;
+
+ if (file->mode == mode)
+ flags |= XMIT_SAME_MODE;
+@@ -375,6 +385,12 @@ static void send_file_entry(struct file_
flags |= XMIT_SAME_TIME;
else
modtime = file->modtime;
-+ if (copy_atimes && !S_ISDIR(mode)) {
++ if (preserve_atimes && !S_ISDIR(mode)) {
+ if (file->atime == atime)
+ flags |= XMIT_SAME_ATIME;
+ else
+ atime = file->atime;
+ }
- #if SUPPORT_HARD_LINKS
+ #ifdef SUPPORT_HARD_LINKS
if (file->link_u.idev) {
-@@ -451,6 +459,8 @@ void send_file_entry(struct file_struct
+@@ -428,6 +444,8 @@ static void send_file_entry(struct file_
write_int(f, modtime);
if (!(flags & XMIT_SAME_MODE))
write_int(f, to_wire_mode(mode));
-+ if (copy_atimes && !S_ISDIR(mode) && !(flags & XMIT_SAME_ATIME))
++ if (preserve_atimes && !S_ISDIR(mode) && !(flags & XMIT_SAME_ATIME))
+ write_int(f, atime);
if (preserve_uid && !(flags & XMIT_SAME_UID)) {
if (!numeric_ids)
add_uid(uid);
-@@ -524,6 +534,7 @@ void receive_file_entry(struct file_stru
- struct file_list *flist, int f)
+@@ -496,6 +514,7 @@ static struct file_struct *receive_file_
+ unsigned short flags, int f)
{
static time_t modtime;
+ static time_t atime;
static mode_t mode;
- static uint64 dev;
+ static int64 dev;
static dev_t rdev;
-@@ -540,7 +551,7 @@ void receive_file_entry(struct file_stru
+@@ -514,7 +533,7 @@ static struct file_struct *receive_file_
struct file_struct *file;
- if (!fptr) {
+ if (!flist) {
- modtime = 0, mode = 0;
+ modtime = 0, atime = 0, mode = 0;
dev = 0, rdev = makedev(0, 0);
rdev_major = 0;
uid = 0, gid = 0;
-@@ -595,6 +606,8 @@ void receive_file_entry(struct file_stru
+@@ -570,6 +589,8 @@ static struct file_struct *receive_file_
modtime = (time_t)read_int(f);
if (!(flags & XMIT_SAME_MODE))
mode = from_wire_mode(read_int(f));
-+ if (copy_atimes && !S_ISDIR(mode) && !(flags & XMIT_SAME_ATIME))
++ if (preserve_atimes && !S_ISDIR(mode) && !(flags & XMIT_SAME_ATIME))
+ atime = (time_t)read_int(f);
- if (preserve_uid && !(flags & XMIT_SAME_UID))
- uid = (uid_t)read_int(f);
-@@ -645,6 +658,7 @@ void receive_file_entry(struct file_stru
-
- file->flags = flags & XMIT_TOP_DIR ? FLAG_TOP_DIR : 0;
- file->modtime = modtime;
-+ file->atime = atime;
- file->length = file_length;
+ if (chmod_modes && !S_ISLNK(mode))
+ mode = tweak_mode(mode, chmod_modes);
+@@ -625,6 +646,8 @@ static struct file_struct *receive_file_
file->mode = mode;
file->uid = uid;
-@@ -866,6 +880,7 @@ skip_excludes:
+ file->gid = gid;
++ if (preserve_atimes)
++ file->atime = atime;
+
+ if (dirname_len) {
+ file->dirname = lastdir = bp;
+@@ -650,12 +673,12 @@ static struct file_struct *receive_file_
+ && lastname[del_hier_name_len-1] == '.'
+ && lastname[del_hier_name_len-2] == '/')
+ del_hier_name_len -= 2;
+- file->flags |= FLAG_TOP_DIR | FLAG_DEL_HERE;
++ FFLAGS(file) |= FLAG_TOP_DIR | FLAG_DEL_HERE;
+ } else if (in_del_hier) {
+ if (!relative_paths || !del_hier_name_len
+ || (l1 >= del_hier_name_len
+ && lastname[del_hier_name_len] == '/'))
+- file->flags |= FLAG_DEL_HERE;
++ FFLAGS(file) |= FLAG_DEL_HERE;
+ else
+ in_del_hier = 0;
+ }
+@@ -871,12 +894,14 @@ struct file_struct *make_file(char *fnam
+ memset(bp, 0, file_struct_len);
+ bp += file_struct_len;
- file->flags = flags;
+- file->flags = flags;
++ FFLAGS(file) = flags;
file->modtime = st.st_mtime;
-+ file->atime = st.st_atime;
file->length = st.st_size;
file->mode = st.st_mode;
file->uid = st.st_uid;
---- orig/generator.c 2004-08-05 18:24:21
-+++ generator.c 2004-07-03 20:15:41
-@@ -90,7 +90,7 @@ static int skip_file(char *fname, struct
- if (ignore_times)
- return 0;
-
-- return cmp_modtime(st->st_mtime, file->modtime) == 0;
-+ return cmp_time(st->st_mtime, file->modtime) == 0;
+ file->gid = st.st_gid;
++ if (preserve_atimes)
++ file->atime = st.st_atime;
+
+ #ifdef SUPPORT_HARD_LINKS
+ if (flist && flist->hlink_pool) {
+@@ -989,7 +1014,7 @@ static void send_if_directory(int f, str
+ char is_dot_dir = fbuf[ol-1] == '.' && (ol == 1 || fbuf[ol-2] == '/');
+
+ if (S_ISDIR(file->mode)
+- && !(file->flags & FLAG_MOUNT_POINT) && f_name(file, fbuf)) {
++ && !(FFLAGS(file) & FLAG_MOUNT_POINT) && f_name(file, fbuf)) {
+ void *save_filters;
+ unsigned int len = strlen(fbuf);
+ if (len > 1 && fbuf[len-1] == '/')
+@@ -1595,8 +1620,9 @@ static void clean_flist(struct file_list
+ }
+ /* Make sure we don't lose track of a user-specified
+ * top directory. */
+- flist->files[keep]->flags |= flist->files[drop]->flags
+- & (FLAG_TOP_DIR|FLAG_DEL_HERE);
++ FFLAGS(flist->files[keep])
++ |= FFLAGS(flist->files[drop])
++ & (FLAG_TOP_DIR|FLAG_DEL_HERE);
+
+ clear_file(flist->files[drop], flist);
+
+@@ -1720,7 +1746,7 @@ static void output_flist(struct file_lis
+ file->dirname ? file->dirname : "",
+ file->dirname ? "/" : "", NS(file->basename),
+ S_ISDIR(file->mode) ? "/" : "", (int)file->mode,
+- (double)file->length, uidbuf, gidbuf, file->flags);
++ (double)file->length, uidbuf, gidbuf, FFLAGS(file));
+ }
}
-
-@@ -470,7 +470,7 @@ static void recv_generator(char *fname,
+--- old/generator.c
++++ new/generator.c
+@@ -45,6 +45,7 @@ extern int preserve_perms;
+ extern int preserve_uid;
+ extern int preserve_gid;
+ extern int preserve_times;
++extern int preserve_atimes;
+ extern int omit_dir_times;
+ extern int delete_mode;
+ extern int delete_before;
+@@ -91,6 +92,7 @@ extern dev_t filesystem_dev;
+ extern char *backup_dir;
+ extern char *backup_suffix;
+ extern int backup_suffix_len;
++extern unsigned int file_struct_len;
+ extern struct file_list *the_file_list;
+ extern struct filter_list_struct server_filter_list;
+
+@@ -185,7 +187,7 @@ static int delete_item(char *fname, int
+ for (j = dirlist->count; j--; ) {
+ struct file_struct *fp = dirlist->files[j];
+
+- if (fp->flags & FLAG_MOUNT_POINT)
++ if (FFLAGS(fp) & FLAG_MOUNT_POINT)
+ continue;
+
+ strlcpy(p, fp->basename, remainder);
+@@ -263,7 +265,7 @@ static void delete_in_dir(struct file_li
+ filt_array[cur_depth] = push_local_filters(fbuf, dlen);
+
+ if (one_file_system) {
+- if (file->flags & FLAG_TOP_DIR)
++ if (FFLAGS(file) & FLAG_TOP_DIR)
+ filesystem_dev = stp->st_dev;
+ else if (filesystem_dev != stp->st_dev)
+ return;
+@@ -275,7 +277,7 @@ static void delete_in_dir(struct file_li
+ * from the filesystem. */
+ for (i = dirlist->count; i--; ) {
+ struct file_struct *fp = dirlist->files[i];
+- if (!fp->basename || fp->flags & FLAG_MOUNT_POINT)
++ if (!fp->basename || FFLAGS(fp) & FLAG_MOUNT_POINT)
+ continue;
+ if (flist_find(flist, fp) < 0) {
+ f_name(fp, delbuf);
+@@ -301,11 +303,11 @@ static void do_delete_pass(struct file_l
+ for (j = 0; j < flist->count; j++) {
+ struct file_struct *file = flist->files[j];
+
+- if (!(file->flags & FLAG_DEL_HERE))
++ if (!(FFLAGS(file) & FLAG_DEL_HERE))
+ continue;
+
+ f_name(file, fbuf);
+- if (verbose > 1 && file->flags & FLAG_TOP_DIR)
++ if (verbose > 1 && FFLAGS(file) & FLAG_TOP_DIR)
+ rprintf(FINFO, "deleting in %s\n", fbuf);
+
+ if (link_stat(fbuf, &st, keep_dirlinks) < 0
+@@ -349,6 +351,9 @@ void itemize(struct file_struct *file, i
+ && (!(iflags & ITEM_XNAME_FOLLOWS) || *xname))
+ || (keep_time && cmp_time(file->modtime, st->st_mtime) != 0))
+ iflags |= ITEM_REPORT_TIME;
++ if (preserve_atimes && !S_ISDIR(file->mode) && !S_ISLNK(file->mode)
++ && cmp_time(file->atime, st->st_atime) != 0)
++ iflags |= ITEM_REPORT_ATIME;
+ if ((file->mode & CHMOD_BITS) != (st->st_mode & CHMOD_BITS))
+ iflags |= ITEM_REPORT_PERMS;
+ if (preserve_uid && am_root && file->uid != st->st_uid)
+@@ -550,7 +555,7 @@ static int find_fuzzy(struct file_struct
+ uint32 dist;
+
+ if (!S_ISREG(fp->mode) || !fp->length
+- || fp->flags & FLAG_NO_FUZZY)
++ || FFLAGS(fp) & FLAG_NO_FUZZY)
+ continue;
+
+ name = fp->basename;
+@@ -659,6 +664,8 @@ static int try_dests_reg(struct file_str
+ itemizing && verbose > 1,
+ code) < 0)
+ goto try_a_copy;
++ if (preserve_atimes)
++ set_file_attrs(fname, file, stp, 0);
+ if (preserve_hard_links && file->link_u.links)
+ hard_link_cluster(file, ndx, itemizing, code);
+ } else if (itemizing)
+@@ -906,7 +913,7 @@ static void recv_generator(char *fname,
+ && verbose && code && f_out != -1)
+ rprintf(code, "%s/\n", fname);
+ if (delete_during && f_out != -1 && !phase && dry_run < 2
+- && (file->flags & FLAG_DEL_HERE))
++ && (FFLAGS(file) & FLAG_DEL_HERE))
+ delete_in_dir(the_file_list, fname, file, &st);
+ return;
+ }
+@@ -1188,7 +1195,7 @@ static void recv_generator(char *fname,
+ if (fuzzy_dirlist) {
+ int j = flist_find(fuzzy_dirlist, file);
+ if (j >= 0) /* don't use changing file as future fuzzy basis */
+- fuzzy_dirlist->files[j]->flags |= FLAG_NO_FUZZY;
++ FFLAGS(fuzzy_dirlist->files[j]) |= FLAG_NO_FUZZY;
}
- if (update_only && fnamecmp == fname
-- && cmp_modtime(st.st_mtime, file->modtime) > 0) {
-+ && cmp_time(st.st_mtime, file->modtime) > 0) {
- if (verbose > 1)
- rprintf(FINFO, "%s is newer\n", safe_fname(fname));
+ /* open the file */
+--- old/hlink.c
++++ new/hlink.c
+@@ -26,6 +26,7 @@ extern int link_dest;
+ extern int make_backups;
+ extern int log_format_has_i;
+ extern char *basis_dir[];
++extern unsigned int file_struct_len;
+ extern struct file_list *the_file_list;
+
+ #ifdef SUPPORT_HARD_LINKS
+@@ -86,10 +87,10 @@ static void link_idev_data(void)
+ FPTR(cur)->link_u.links = pool_talloc(hlink_pool,
+ struct hlink, 1, "hlink_list");
+
+- FPTR(head)->flags |= FLAG_HLINK_TOL;
++ FFLAGS(FPTR(head)) |= FLAG_HLINK_TOL;
+ FPTR(cur)->F_HLINDEX = to;
+ FPTR(cur)->F_NEXT = head;
+- FPTR(cur)->flags |= FLAG_HLINK_EOL;
++ FFLAGS(FPTR(cur)) |= FLAG_HLINK_EOL;
+ hlink_list[to++] = head;
+ } else
+ FPTR(cur)->link_u.links = NULL;
+@@ -175,7 +176,7 @@ int hard_link_check(struct file_struct *
+ {
+ #ifdef SUPPORT_HARD_LINKS
+ int head;
+- if (skip && !(file->flags & FLAG_HLINK_EOL))
++ if (skip && !(FFLAGS(file) & FLAG_HLINK_EOL))
+ head = hlink_list[file->F_HLINDEX] = file->F_NEXT;
+ else
+ head = hlink_list[file->F_HLINDEX];
+@@ -270,8 +271,8 @@ void hard_link_cluster(struct file_struc
+ file->F_HLINDEX = FINISHED_LINK;
+ if (link_stat(f_name(file, hlink1), &st1, 0) < 0)
return;
---- orig/options.c 2004-08-11 23:42:23
-+++ options.c 2004-07-03 20:15:41
-@@ -48,6 +48,7 @@ int preserve_devices = 0;
- int preserve_uid = 0;
+- if (!(file->flags & FLAG_HLINK_TOL)) {
+- while (!(file->flags & FLAG_HLINK_EOL)) {
++ if (!(FFLAGS(file) & FLAG_HLINK_TOL)) {
++ while (!(FFLAGS(file) & FLAG_HLINK_EOL)) {
+ ndx = file->F_NEXT;
+ file = FPTR(ndx);
+ }
+@@ -286,6 +287,6 @@ void hard_link_cluster(struct file_struc
+ maybe_hard_link(file, ndx, hlink2, statret, &st2,
+ hlink1, &st1, itemizing, code);
+ file->F_HLINDEX = FINISHED_LINK;
+- } while (!(file->flags & FLAG_HLINK_EOL));
++ } while (!(FFLAGS(file) & FLAG_HLINK_EOL));
+ #endif
+ }
+--- old/log.c
++++ new/log.c
+@@ -42,6 +42,7 @@ extern int msg_fd_out;
+ extern int allow_8bit_chars;
+ extern int protocol_version;
+ extern int preserve_times;
++extern int preserve_atimes;
+ extern int log_format_has_i;
+ extern int log_format_has_o_or_i;
+ extern int daemon_log_format_has_o_or_i;
+@@ -608,7 +609,8 @@ static void log_formatted(enum logcode c
+ n[5] = !(iflags & ITEM_REPORT_PERMS) ? '.' : 'p';
+ n[6] = !(iflags & ITEM_REPORT_OWNER) ? '.' : 'o';
+ n[7] = !(iflags & ITEM_REPORT_GROUP) ? '.' : 'g';
+- n[8] = '.';
++ n[8] = !(iflags & ITEM_REPORT_ATIME) ? '.'
++ : S_ISLNK(file->mode) ? 'U' : 'u';
+ n[9] = '\0';
+
+ if (iflags & (ITEM_IS_NEW|ITEM_MISSING_DATA)) {
+--- old/options.c
++++ new/options.c
+@@ -52,6 +52,7 @@ int preserve_uid = 0;
int preserve_gid = 0;
int preserve_times = 0;
-+int copy_atimes = 0;
+ int omit_dir_times = 0;
++int preserve_atimes = 0;
int update_only = 0;
int cvs_exclude = 0;
int dry_run = 0;
-@@ -253,6 +254,7 @@ void usage(enum logcode F)
- rprintf(F," -g, --group preserve group\n");
- rprintf(F," -D, --devices preserve devices (root only)\n");
- rprintf(F," -t, --times preserve times\n");
-+ rprintf(F," -A, --copy-atimes copy access times\n");
+@@ -299,8 +300,9 @@ void usage(enum logcode F)
+ rprintf(F," --devices preserve device files (super-user only)\n");
+ rprintf(F," --specials preserve special files\n");
+ rprintf(F," -D same as --devices --specials\n");
+- rprintf(F," -t, --times preserve times\n");
+- rprintf(F," -O, --omit-dir-times omit directories when preserving times\n");
++ rprintf(F," -t, --times preserve modify times\n");
++ rprintf(F," -O, --omit-dir-times omit directories when preserving modify times\n");
++ rprintf(F," -U, --atimes preserve access (use) times\n");
+ rprintf(F," --super receiver attempts super-user activities\n");
rprintf(F," -S, --sparse handle sparse files efficiently\n");
rprintf(F," -n, --dry-run show what would have been transferred\n");
- rprintf(F," -W, --whole-file copy whole files, no incremental checks\n");
-@@ -362,6 +364,7 @@ static struct poptOption long_options[]
- {"group", 'g', POPT_ARG_NONE, &preserve_gid, 0, 0, 0 },
- {"devices", 'D', POPT_ARG_NONE, &preserve_devices, 0, 0, 0 },
- {"times", 't', POPT_ARG_NONE, &preserve_times, 0, 0, 0 },
-+ {"copy-atimes", 'A', POPT_ARG_NONE, ©_atimes, 0, 0, 0 },
- {"checksum", 'c', POPT_ARG_NONE, &always_checksum, 0, 0, 0 },
- {"verbose", 'v', POPT_ARG_NONE, 0, 'v', 0, 0 },
- {"quiet", 'q', POPT_ARG_NONE, 0, 'q', 0, 0 },
-@@ -940,6 +943,8 @@ void server_options(char **args,int *arg
+@@ -411,6 +413,9 @@ static struct poptOption long_options[]
+ {"times", 't', POPT_ARG_VAL, &preserve_times, 1, 0, 0 },
+ {"no-times", 0, POPT_ARG_VAL, &preserve_times, 0, 0, 0 },
+ {"no-t", 0, POPT_ARG_VAL, &preserve_times, 0, 0, 0 },
++ {"atimes", 'U', POPT_ARG_VAL, &preserve_atimes, 1, 0, 0 },
++ {"no-atimes", 0, POPT_ARG_VAL, &preserve_atimes, 0, 0, 0 },
++ {"no-k", 0, POPT_ARG_VAL, &preserve_atimes, 0, 0, 0 },
+ {"omit-dir-times", 'O', POPT_ARG_VAL, &omit_dir_times, 2, 0, 0 },
+ {"modify-window", 0, POPT_ARG_INT, &modify_window, OPT_MODIFY_WINDOW, 0, 0 },
+ {"super", 0, POPT_ARG_VAL, &am_root, 2, 0, 0 },
+@@ -1510,6 +1515,8 @@ void server_options(char **args,int *arg
argstr[x++] = 'D';
if (preserve_times)
argstr[x++] = 't';
-+ if (copy_atimes)
-+ argstr[x++] = 'A';
++ if (preserve_atimes)
++ argstr[x++] = 'U';
if (preserve_perms)
argstr[x++] = 'p';
- if (recurse)
---- orig/rsync.c 2004-08-09 21:07:10
-+++ rsync.c 2004-07-03 20:15:41
-@@ -25,6 +25,7 @@
- extern int verbose;
- extern int dry_run;
+ else if (preserve_executability && am_sender)
+--- old/rsync.c
++++ new/rsync.c
+@@ -35,6 +35,7 @@ extern int dry_run;
+ extern int daemon_log_format_has_i;
+ extern int preserve_perms;
+ extern int preserve_executability;
++extern int preserve_atimes;
extern int preserve_times;
-+extern int copy_atimes;
+ extern int omit_dir_times;
extern int am_root;
- extern int am_sender;
- extern int am_generator;
-@@ -145,17 +146,31 @@ int set_perms(char *fname,struct file_st
- if (!preserve_times || S_ISLNK(st->st_mode)
- || (make_backups && !backup_dir && S_ISDIR(st->st_mode)))
- flags |= PERMS_SKIP_MTIME;
-- if (!(flags & PERMS_SKIP_MTIME)
-- && cmp_modtime(st->st_mtime, file->modtime) != 0) {
-+ if (!copy_atimes || S_ISLNK(st->st_mode) || S_ISDIR(st->st_mode))
-+ flags |= PERMS_SKIP_ATIME;
-+ if (!(flags & (PERMS_SKIP_MTIME|PERMS_SKIP_ATIME))) {
-+ time_t atime, mtime;
-+
-+ if (!(flags & PERMS_SKIP_ATIME)
-+ && cmp_time(st->st_atime, file->atime) != 0) {
-+ atime = file->atime;
-+ updated = 1;
-+ } else
-+ atime = st->st_atime;
-+ if (!(flags & PERMS_SKIP_MTIME)
-+ && cmp_time(st->st_mtime, file->modtime) != 0) {
-+ mtime = file->modtime;
-+ updated = 1;
-+ } else
-+ mtime = st->st_mtime;
- /* don't complain about not setting times on directories
- * because some filesystems can't do it */
-- if (set_modtime(fname,file->modtime) != 0 &&
-+ if (updated && set_times(fname, mtime, atime) != 0 &&
- !S_ISDIR(st->st_mode)) {
+@@ -128,6 +129,7 @@ int set_file_attrs(char *fname, struct f
+ int updated = 0;
+ STRUCT_STAT st2;
+ int change_uid, change_gid;
++ time_t atime, mtime;
+
+ if (!st) {
+ if (dry_run)
+@@ -146,18 +148,33 @@ int set_file_attrs(char *fname, struct f
+ }
+ }
+
++ /* This code must be the first update in the function due to
++ * how it uses the "updated" variable. */
+ if (!preserve_times || (S_ISDIR(st->st_mode) && omit_dir_times))
+ flags |= ATTRS_SKIP_MTIME;
++ if (!preserve_atimes || S_ISDIR(st->st_mode))
++ flags |= ATTRS_SKIP_ATIME;
+ if (!(flags & ATTRS_SKIP_MTIME)
+ && cmp_time(st->st_mtime, file->modtime) != 0) {
+- int ret = set_modtime(fname, file->modtime, st->st_mode);
++ mtime = file->modtime;
++ updated = 1;
++ } else
++ mtime = st->st_mtime;
++ if (!(flags & ATTRS_SKIP_ATIME)
++ && cmp_time(st->st_atime, file->atime) != 0) {
++ atime = file->atime;
++ updated = 1;
++ } else
++ atime = st->st_atime;
++ if (updated) {
++ int ret = set_times(fname, mtime, atime, st->st_mode);
+ if (ret < 0) {
rsyserr(FERROR, errno, "failed to set times on %s",
full_fname(fname));
return 0;
}
-- updated = 1;
+- if (ret == 0) /* ret == 1 if symlink could not be set */
+- updated = 1;
++ if (ret > 0) /* ret == 1 if symlink could not be set */
++ updated = 0;
}
change_uid = am_root && preserve_uid && st->st_uid != file->uid;
---- orig/rsync.h 2004-08-03 15:41:32
-+++ rsync.h 2004-07-03 20:15:41
+--- old/rsync.h
++++ new/rsync.h
@@ -54,6 +54,7 @@
#define XMIT_HAS_IDEV_DATA (1<<9)
#define XMIT_SAME_DEV (1<<10)
/* These flags are used in the live flist data. */
-@@ -111,6 +112,7 @@
+@@ -119,6 +120,7 @@
- #define PERMS_REPORT (1<<0)
- #define PERMS_SKIP_MTIME (1<<1)
-+#define PERMS_SKIP_ATIME (1<<2)
+ #define ATTRS_REPORT (1<<0)
+ #define ATTRS_SKIP_MTIME (1<<1)
++#define ATTRS_SKIP_ATIME (1<<2)
#define FULL_FLUSH 1
#define NORMAL_FLUSH 0
-@@ -425,6 +427,7 @@ struct file_struct {
- struct hlink *links;
- } link_u;
- time_t modtime;
-+ time_t atime;
+@@ -135,6 +137,7 @@
+ #define FNAMECMP_FUZZY 0x83
+
+ /* For use by the itemize_changes code */
++#define ITEM_REPORT_ATIME (1<<0)
+ #define ITEM_REPORT_CHECKSUM (1<<1)
+ #define ITEM_REPORT_SIZE (1<<2)
+ #define ITEM_REPORT_TIME (1<<3)
+@@ -520,9 +523,12 @@ struct file_struct {
uid_t uid;
gid_t gid;
mode_t mode;
---- orig/rsync.yo 2004-08-11 17:26:27
-+++ rsync.yo 2004-07-03 20:15:41
-@@ -301,6 +301,7 @@ verb(
- -g, --group preserve group
- -D, --devices preserve devices (root only)
- -t, --times preserve times
-+ -A, --copy-atimes copy access times
+- uchar flags; /* this item MUST remain last */
++ time_t atime; /* this MUST be second to last */
++ uchar fl4g5; /* this item MUST remain last */
+ };
+
++#define FFLAGS(f) ((uchar*)(f))[file_struct_len-1]
++
+ /*
+ * Start the flist array at FLIST_START entries and grow it
+ * by doubling until FLIST_LINEAR then grow by FLIST_LINEAR
+--- old/rsync.yo
++++ new/rsync.yo
+@@ -325,8 +325,9 @@ to the detailed description below for a
+ --devices preserve device files (super-user only)
+ --specials preserve special files
+ -D same as --devices --specials
+- -t, --times preserve times
+- -O, --omit-dir-times omit directories when preserving times
++ -t, --times preserve modify times
++ -O, --omit-dir-times omit directories when preserving mod-times
++ -U, --atimes preserve access (use) times
+ --super receiver attempts super-user activities
-S, --sparse handle sparse files efficiently
-n, --dry-run show what would have been transferred
- -W, --whole-file copy whole files, no incremental checks
-@@ -574,6 +575,11 @@ cause the next transfer to behave as if
- updated (though the rsync algorithm will make the update fairly efficient
- if the files haven't actually changed, you're much better off using -t).
-
-+dit(bf(-A, --copy-atimes)) This tells rsync to transfer access times
-+along with the files and update them on the remote system. Note that
-+reading the source file may update the atime and hence repeated rsync
-+copies with --copy-atimes may copy files unnecessarily.
+@@ -814,6 +815,12 @@ it is preserving modification times (see
+ the directories on the receiving side, it is a good idea to use bf(-O).
+ This option is inferred if you use bf(--backup) without bf(--backup-dir).
+
++dit(bf(-U, --atimes)) This tells rsync to set the access (use) times of the
++destination files to the same value as the source files. Note that the
++reading of the source file may update the atime of the source files, so
++repeated rsync runs with --atimes may be needed if you want to force the
++access-time values to be 100% identical on the two systems.
+
- dit(bf(-n, --dry-run)) This tells rsync to not do any file transfers,
- instead it will just report the actions it would have taken.
+ dit(bf(--super)) This tells the receiving side to attempt super-user
+ activities even if the receiving rsync wasn't run by the super-user. These
+ activities include: preserving users via the bf(--owner) option, preserving
+@@ -1322,7 +1329,7 @@ with older versions of rsync, but that a
+ verbose messages).
+
+ The "%i" escape has a cryptic output that is 9 letters long. The general
+-format is like the string bf(YXcstpogz), where bf(Y) is replaced by the
++format is like the string bf(YXcstpogu), where bf(Y) is replaced by the
+ type of update being done, bf(X) is replaced by the file-type, and the
+ other letters represent attributes that may be output if they are being
+ modified.
+@@ -1362,7 +1369,7 @@ quote(itemize(
+ by the file transfer.
+ it() A bf(t) means the modification time is different and is being updated
+ to the sender's value (requires bf(--times)). An alternate value of bf(T)
+- means that the time will be set to the transfer time, which happens
++ means that the modify time will be set to the transfer time, which happens
+ anytime a symlink is transferred, or when a file or device is transferred
+ without bf(--times).
+ it() A bf(p) means the permissions are different and are being updated to
+@@ -1371,7 +1378,10 @@ quote(itemize(
+ sender's value (requires bf(--owner) and super-user privileges).
+ it() A bf(g) means the group is different and is being updated to the
+ sender's value (requires bf(--group) and the authority to set the group).
+- it() The bf(z) slot is reserved for future use.
++ it() A bf(u) means the access (use) time is different and is being updated to
++ the sender's value (requires bf(--atimes)). An alternate value of bf(U)
++ means that the access time will be set to the transfer time, which happens
++ when a symlink or directory is updated.
+ ))
+
+ One other output is possible: when deleting files, the "%i" will output
+--- old/sender.c
++++ new/sender.c
+@@ -38,6 +38,7 @@ extern int do_progress;
+ extern int inplace;
+ extern int batch_fd;
+ extern int write_batch;
++extern unsigned int file_struct_len;
+ extern struct stats stats;
+ extern struct file_list *the_file_list;
+ extern char *log_format;
+@@ -126,7 +127,7 @@ void successful_send(int ndx)
+
+ file = the_file_list->files[ndx];
+ /* The generator might tell us about symlinks we didn't send. */
+- if (!(file->flags & FLAG_SENT) && !S_ISLNK(file->mode))
++ if (!(FFLAGS(file) & FLAG_SENT) && !S_ISLNK(file->mode))
+ return;
+ if (file->dir.root) {
+ offset = stringjoin(fname, sizeof fname,
+@@ -370,7 +371,7 @@ void send_files(struct file_list *flist,
+ rprintf(FINFO, "sender finished %s\n", fname);
+
+ /* Flag that we actually sent this entry. */
+- file->flags |= FLAG_SENT;
++ FFLAGS(file) |= FLAG_SENT;
+ }
+ make_backups = save_make_backups;
---- orig/testsuite/copy-atimes.test 2004-06-30 00:06:23
-+++ testsuite/copy-atimes.test 2004-06-30 00:06:23
+--- old/testsuite/atimes.test
++++ new/testsuite/atimes.test
@@ -0,0 +1,19 @@
+#! /bin/sh
+
+
+TLS_ARGS=--atime
+
-+checkit "$RSYNC -rtAgvvv \"$fromdir/\" \"$todir/\"" "$fromdir" "$todir"
++checkit "$RSYNC -rtUgvvv \"$fromdir/\" \"$todir/\"" "$fromdir" "$todir"
+
+# The script would have aborted on error, so getting here means we've won.
+exit 0
---- orig/testsuite/rsync.fns 2004-07-23 17:16:13
-+++ testsuite/rsync.fns 2004-07-03 20:15:41
-@@ -50,7 +50,7 @@ printmsg() {
-
+--- old/testsuite/rsync.fns
++++ new/testsuite/rsync.fns
+@@ -66,7 +66,7 @@ printmsg() {
+ }
rsync_ls_lR() {
-- find "$@" -print | sort | xargs "$TOOLDIR/tls"
-+ find "$@" -print | sort | xargs "$TOOLDIR/tls" $TLS_ARGS
+- find "$@" -print | sort | sed 's/ /\\ /g' | xargs "$TOOLDIR/tls"
++ find "$@" -print | sort | sed 's/ /\\ /g' | xargs "$TOOLDIR/tls" $TLS_ARGS
}
- rsync_getgroups() {
-@@ -150,6 +150,8 @@ checkit() {
+ check_perms() {
+@@ -184,6 +184,10 @@ checkit() {
# We can just write everything to stdout/stderr, because the
# wrapper hides it unless there is a problem.
-+ ( cd "$2" && rsync_ls_lR . ) > "$tmpdir/ls-from"
++ if test x$TLS_ARGS = x--atime; then
++ ( cd "$2" && rsync_ls_lR . ) > "$tmpdir/ls-from"
++ fi
+
echo "Running: \"$1\""
eval "$1"
status=$?
-@@ -158,6 +160,12 @@ checkit() {
+@@ -191,10 +195,13 @@ checkit() {
+ failed="YES";
fi
- echo "-------------"
-+ echo "check how the directory listings compare with diff:"
-+ echo ""
-+ ( cd "$3" && rsync_ls_lR . ) > "$tmpdir/ls-to"
-+ diff $diffopt "$tmpdir/ls-from" "$tmpdir/ls-to" || failed=YES
++ if test x$TLS_ARGS != x--atime; then
++ ( cd "$2" && rsync_ls_lR . ) > "$tmpdir/ls-from"
++ fi
+
-+ echo "-------------"
- echo "check how the files compare with diff:"
+ echo "-------------"
+ echo "check how the directory listings compare with diff:"
echo ""
- for f in `cd "$2"; find . -type f -print `
-@@ -165,12 +173,6 @@ checkit() {
- diff $diffopt "$2"/"$f" "$3"/"$f" || failed=YES
- done
-
-- echo "-------------"
-- echo "check how the directory listings compare with diff:"
-- echo ""
- ( cd "$2" && rsync_ls_lR . ) > "$tmpdir/ls-from"
-- ( cd "$3" && rsync_ls_lR . ) > "$tmpdir/ls-to"
-- diff $diffopt "$tmpdir/ls-from" "$tmpdir/ls-to" || failed=YES
- if [ -z "$failed" ] ; then
- return 0
- else
---- orig/tls.c 2004-05-15 20:10:13
-+++ tls.c 2004-07-03 20:15:41
+ ( cd "$3" && rsync_ls_lR . ) > "$tmpdir/ls-to"
+ diff $diffopt "$tmpdir/ls-from" "$tmpdir/ls-to" || failed=YES
+
+--- old/tls.c
++++ new/tls.c
@@ -39,6 +39,7 @@
+ struct tm *mt = gmtime(&t);
+ sprintf(dest, "%04d-%02d-%02d %02d:%02d:%02d ",
-+ mt->tm_year + 1900,
-+ mt->tm_mon + 1,
-+ mt->tm_mday,
-+ mt->tm_hour,
-+ mt->tm_min,
-+ mt->tm_sec);
++ (int)mt->tm_year + 1900,
++ (int)mt->tm_mon + 1,
++ (int)mt->tm_mday,
++ (int)mt->tm_hour,
++ (int)mt->tm_min,
++ (int)mt->tm_sec);
+ } else {
+ strcpy(dest, " ");
+ }
+ char atimebuf[50];
char linkbuf[4096];
- if (do_lstat(fname, &buf) == -1)
+ if (do_lstat(fname, &buf) < 0)
@@ -96,19 +113,8 @@ static void list_file(const char *fname)
permstring(permbuf, buf.st_mode);
- mt = gmtime(&buf.st_mtime);
-
- sprintf(datebuf, "%04d-%02d-%02d %02d:%02d:%02d",
-- mt->tm_year + 1900,
-- mt->tm_mon + 1,
-- mt->tm_mday,
-- mt->tm_hour,
-- mt->tm_min,
-- mt->tm_sec);
+- (int)mt->tm_year + 1900,
+- (int)mt->tm_mon + 1,
+- (int)mt->tm_mday,
+- (int)mt->tm_hour,
+- (int)mt->tm_min,
+- (int)mt->tm_sec);
- } else {
- strcpy(datebuf, " ");
- }
+ printf(" %6ld.%-6ld %6ld %s%s%s%s\n",
(long)buf.st_uid, (long)buf.st_gid, (long)buf.st_nlink,
- datebuf, fname, linkbuf);
-+ mtimebuf, display_atime ? atimebuf : "",
++ mtimebuf, display_atime && !S_ISDIR(buf.st_mode) ? atimebuf : "",
+ fname, linkbuf);
}
return 0;
}
---- orig/util.c 2004-08-11 23:42:23
-+++ util.c 2004-07-03 20:15:41
-@@ -128,31 +128,39 @@ void overflow(char *str)
-
-
+--- old/util.c
++++ new/util.c
+@@ -126,7 +126,7 @@ void overflow_exit(char *str)
+ exit_cleanup(RERR_MALLOC);
+ }
--int set_modtime(char *fname, time_t modtime)
-+int set_times(char *fname, time_t modtime, time_t atime)
+-int set_modtime(char *fname, time_t modtime, mode_t mode)
++int set_times(char *fname, time_t modtime, time_t atime, mode_t mode)
{
- if (dry_run)
- return 0;
+ #if !defined HAVE_LUTIMES || !defined HAVE_UTIMES
+ if (S_ISLNK(mode))
+@@ -134,9 +134,13 @@ int set_modtime(char *fname, time_t modt
+ #endif
if (verbose > 2) {
- rprintf(FINFO, "set modtime of %s to (%ld) %s",
+ char mtimebuf[200];
-+ char atimebuf[200];
+
+ strlcpy(mtimebuf, timestring(modtime), sizeof mtimebuf);
-+ strlcpy(atimebuf, timestring(atime), sizeof atimebuf);
-+
+ rprintf(FINFO,
+ "set modtime, atime of %s to (%ld) %s, (%ld) %s\n",
fname, (long)modtime,
- asctime(localtime(&modtime)));
-+ mtimebuf,
-+ (long)atime, atimebuf);
++ mtimebuf, (long)atime, timestring(atime));
}
+ if (dry_run)
+@@ -145,7 +149,7 @@ int set_modtime(char *fname, time_t modt
{
- #ifdef HAVE_UTIMBUF
+ #ifdef HAVE_UTIMES
+ struct timeval t[2];
+- t[0].tv_sec = time(NULL);
++ t[0].tv_sec = atime;
+ t[0].tv_usec = 0;
+ t[1].tv_sec = modtime;
+ t[1].tv_usec = 0;
+@@ -156,12 +160,12 @@ int set_modtime(char *fname, time_t modt
+ return utimes(fname, t);
+ #elif defined HAVE_UTIMBUF
struct utimbuf tbuf;
- tbuf.actime = time(NULL);
+ tbuf.actime = atime;
tbuf.modtime = modtime;
return utime(fname,&tbuf);
- #elif defined(HAVE_UTIME)
+ #elif defined HAVE_UTIME
time_t t[2];
- t[0] = time(NULL);
+ t[0] = atime;
t[1] = modtime;
return utime(fname,t);
#else
- struct timeval t[2];
-- t[0].tv_sec = time(NULL);
-+ t[0].tv_sec = atime;
- t[0].tv_usec = 0;
- t[1].tv_sec = modtime;
- t[1].tv_usec = 0;
-@@ -1156,8 +1164,8 @@ int msleep(int t)
-
-
- /**
-- * Determine if two file modification times are equivalent (either
-- * exact or in the modification timestamp window established by
-+ * Determine if two file times are equivalent (either
-+ * exact or in the timestamp window established by
- * --modify-window).
- *
- * @retval 0 if the times should be treated as the same
-@@ -1166,7 +1174,7 @@ int msleep(int t)
- *
- * @retval -1 if the 2nd is later
- **/
--int cmp_modtime(time_t file1, time_t file2)
-+int cmp_time(time_t file1, time_t file2)
- {
- if (file2 > file1) {
- if (file2 - file1 <= modify_window)
Matt McCutchen's Web Site / rsync / rsync-patches.git / blobdiff