X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/blobdiff_plain/5560279111e8981059950768e83db141bf42f119..c2f699cc6bfb241c97cc53dfe6bfd0ea0385456c:/atimes.diff diff --git a/atimes.diff b/atimes.diff index f639351..0ec615a 100644 --- a/atimes.diff +++ b/atimes.diff @@ -1,20 +1,22 @@ -After applying this patch and running configure, you MUST run this -command before "make": +To use this patch, run these commands for a successful build: - make proto + patch -p1 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), + preserve_atimes ? timestring(f->atime) : "", f_name(f, NULL), f->u.link); @@ -44,13 +46,13 @@ command before "make": { - 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), + preserve_atimes ? timestring(f->atime) : "", f_name(f, NULL)); } } -@@ -310,6 +319,7 @@ static void send_file_entry(struct file_ +@@ -302,6 +311,7 @@ static void send_file_entry(struct file_ { unsigned short flags; static time_t modtime; @@ -58,16 +60,16 @@ command before "make": static mode_t mode; static int64 dev; static dev_t rdev; -@@ -325,7 +335,7 @@ static void send_file_entry(struct file_ +@@ -317,7 +327,7 @@ static void send_file_entry(struct file_ if (!file) { write_byte(f, 0); - modtime = 0, mode = 0; + modtime = 0, atime = 0, mode = 0; - dev = 0, rdev = makedev(0, 0); + dev = 0, rdev = MAKEDEV(0, 0); rdev_major = 0; uid = 0, gid = 0; -@@ -337,7 +347,7 @@ static void send_file_entry(struct file_ +@@ -327,7 +337,7 @@ static void send_file_entry(struct file_ f_name(file, fname); @@ -76,7 +78,7 @@ command before "make": if (file->mode == mode) flags |= XMIT_SAME_MODE; -@@ -374,6 +384,12 @@ static void send_file_entry(struct file_ +@@ -363,6 +373,12 @@ static void send_file_entry(struct file_ flags |= XMIT_SAME_TIME; else modtime = file->modtime; @@ -89,7 +91,7 @@ command before "make": #ifdef SUPPORT_HARD_LINKS if (file->link_u.idev) { -@@ -427,6 +443,8 @@ static void send_file_entry(struct file_ +@@ -416,6 +432,8 @@ static void send_file_entry(struct file_ write_int(f, modtime); if (!(flags & XMIT_SAME_MODE)) write_int(f, to_wire_mode(mode)); @@ -98,7 +100,7 @@ command before "make": if (preserve_uid && !(flags & XMIT_SAME_UID)) { if (!numeric_ids) add_uid(uid); -@@ -494,6 +512,7 @@ static struct file_struct *receive_file_ +@@ -482,6 +500,7 @@ static struct file_struct *receive_file_ unsigned short flags, int f) { static time_t modtime; @@ -106,16 +108,16 @@ command before "make": static mode_t mode; static int64 dev; static dev_t rdev; -@@ -512,7 +531,7 @@ static struct file_struct *receive_file_ +@@ -500,7 +519,7 @@ static struct file_struct *receive_file_ struct file_struct *file; if (!flist) { - modtime = 0, mode = 0; + modtime = 0, atime = 0, mode = 0; - dev = 0, rdev = makedev(0, 0); + dev = 0, rdev = MAKEDEV(0, 0); rdev_major = 0; uid = 0, gid = 0; -@@ -568,6 +587,8 @@ static struct file_struct *receive_file_ +@@ -556,6 +575,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)); @@ -124,16 +126,16 @@ command before "make": if (chmod_modes && !S_ISLNK(mode)) mode = tweak_mode(mode, chmod_modes); -@@ -623,6 +644,8 @@ static struct file_struct *receive_file_ - file->length = file_length; +@@ -611,6 +632,8 @@ static struct file_struct *receive_file_ file->mode = mode; - file->ids = id_pair(uid, gid); + file->uid = uid; + file->gid = gid; + if (preserve_atimes) + file->atime = atime; if (dirname_len) { file->dirname = lastdir = bp; -@@ -648,12 +671,12 @@ static struct file_struct *receive_file_ +@@ -636,12 +659,12 @@ static struct file_struct *receive_file_ && lastname[del_hier_name_len-1] == '.' && lastname[del_hier_name_len-2] == '/') del_hier_name_len -= 2; @@ -148,7 +150,7 @@ command before "make": else in_del_hier = 0; } -@@ -874,11 +897,13 @@ struct file_struct *make_file(char *fnam +@@ -858,12 +881,14 @@ struct file_struct *make_file(char *fnam memset(bp, 0, file_struct_len); bp += file_struct_len; @@ -157,13 +159,14 @@ command before "make": file->modtime = st.st_mtime; file->length = st.st_size; file->mode = st.st_mode; - file->ids = id_pair(st.st_uid, st.st_gid); + file->uid = st.st_uid; + 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 +@@ -976,7 +1001,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) @@ -172,19 +175,19 @@ command before "make": void *save_filters; unsigned int len = strlen(fbuf); if (len > 1 && fbuf[len-1] == '/') -@@ -1567,8 +1592,9 @@ static void clean_flist(struct file_list +@@ -1586,8 +1611,9 @@ static void clean_flist(struct file_list } - /* Make sure that if we unduplicate '.', that we don't - * lose track of a user-specified top directory. */ + /* 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(drop, flist); + clear_file(flist->files[drop], flist); -@@ -1630,7 +1656,7 @@ static void output_flist(struct file_lis +@@ -1711,7 +1737,7 @@ static void output_flist(struct file_lis file->dirname ? file->dirname : "", file->dirname ? "/" : "", NS(file->basename), S_ISDIR(file->mode) ? "/" : "", (int)file->mode, @@ -193,17 +196,17 @@ command before "make": } } ---- orig/generator.c 2006-01-24 19:03:07 -+++ generator.c 2006-01-24 22:29:56 +--- old/generator.c ++++ new/generator.c @@ -43,6 +43,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; - extern int delete_during; -@@ -89,6 +90,7 @@ extern dev_t filesystem_dev; +@@ -90,6 +91,7 @@ extern dev_t filesystem_dev; extern char *backup_dir; extern char *backup_suffix; extern int backup_suffix_len; @@ -211,7 +214,7 @@ command before "make": extern struct file_list *the_file_list; extern struct filter_list_struct server_filter_list; -@@ -183,7 +185,7 @@ static int delete_item(char *fname, int +@@ -182,7 +184,7 @@ static int delete_item(char *fname, int for (j = dirlist->count; j--; ) { struct file_struct *fp = dirlist->files[j]; @@ -220,7 +223,7 @@ command before "make": continue; strlcpy(p, fp->basename, remainder); -@@ -261,7 +263,7 @@ static void delete_in_dir(struct file_li +@@ -260,7 +262,7 @@ static void delete_in_dir(struct file_li filt_array[cur_depth] = push_local_filters(fbuf, dlen); if (one_file_system) { @@ -229,7 +232,7 @@ command before "make": filesystem_dev = stp->st_dev; else if (filesystem_dev != stp->st_dev) return; -@@ -273,7 +275,7 @@ static void delete_in_dir(struct file_li +@@ -272,7 +274,7 @@ static void delete_in_dir(struct file_li * from the filesystem. */ for (i = dirlist->count; i--; ) { struct file_struct *fp = dirlist->files[i]; @@ -237,8 +240,8 @@ command before "make": + if (!fp->basename || FFLAGS(fp) & FLAG_MOUNT_POINT) continue; if (flist_find(flist, fp) < 0) { - int mode = fp->mode; -@@ -300,11 +302,11 @@ static void do_delete_pass(struct file_l + f_name(fp, delbuf); +@@ -298,11 +300,11 @@ static void do_delete_pass(struct file_l for (j = 0; j < flist->count; j++) { struct file_struct *file = flist->files[j]; @@ -252,29 +255,17 @@ command before "make": rprintf(FINFO, "deleting in %s\n", fbuf); if (link_stat(fbuf, &st, keep_dirlinks) < 0 -@@ -346,8 +348,11 @@ void itemize(struct file_struct *file, i - iflags |= ITEM_REPORT_SIZE; - if ((iflags & (ITEM_TRANSFER|ITEM_LOCAL_CHANGE) && !keep_time +@@ -346,6 +348,9 @@ void itemize(struct file_struct *file, i && (!(iflags & ITEM_XNAME_FOLLOWS) || *xname)) -- || (keep_time && cmp_modtime(file->modtime, st->st_mtime) != 0)) -+ || (keep_time && cmp_time(file->modtime, st->st_mtime) != 0)) + || (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 (preserve_perms - && (file->mode & CHMOD_BITS) != (st->st_mode & CHMOD_BITS)) + if ((file->mode & CHMOD_BITS) != (st->st_mode & CHMOD_BITS)) iflags |= ITEM_REPORT_PERMS; -@@ -396,7 +401,7 @@ int unchanged_file(char *fn, struct file - if (ignore_times) - return 0; - -- return cmp_modtime(st->st_mtime, file->modtime) == 0; -+ return cmp_time(st->st_mtime, file->modtime) == 0; - } - - -@@ -550,13 +555,13 @@ static int find_fuzzy(struct file_struct + if (preserve_uid && am_root && file->uid != st->st_uid) +@@ -549,7 +554,7 @@ static int find_fuzzy(struct file_struct uint32 dist; if (!S_ISREG(fp->mode) || !fp->length @@ -283,24 +274,26 @@ command before "make": continue; name = fp->basename; - - if (fp->length == file->length -- && cmp_modtime(fp->modtime, file->modtime) == 0) { -+ && cmp_time(fp->modtime, file->modtime) == 0) { - if (verbose > 4) { - rprintf(FINFO, - "fuzzy size/modtime match for %s\n", -@@ -632,7 +637,7 @@ static int try_dests_reg(struct file_str - if (!unchanged_attrs(file, stp)) - continue; - if ((always_checksum || ignore_times) -- && cmp_modtime(stp->st_mtime, file->modtime)) -+ && cmp_time(stp->st_mtime, file->modtime)) - continue; - best_match = j; - match_level = 3; -@@ -894,7 +899,7 @@ static void recv_generator(char *fname, - && verbose && code && f_out != -1) +@@ -658,6 +663,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) { + if (dry_run) + file->link_u.links->link_dest_used = j + 1; +@@ -930,7 +937,7 @@ static void recv_generator(char *fname, + rsyserr(FERROR, errno, + "recv_generator: mkdir %s failed", + full_fname(fname)); +- file->flags |= FLAG_MISSING; ++ FFLAGS(file) |= FLAG_MISSING; + if (ndx+1 < the_file_list->count + && the_file_list->files[ndx+1]->dir.depth > file->dir.depth) { + rprintf(FERROR, +@@ -944,7 +951,7 @@ static void recv_generator(char *fname, + && verbose && code != FNONE && f_out != -1) rprintf(code, "%s/\n", fname); if (delete_during && f_out != -1 && !phase && dry_run < 2 - && (file->flags & FLAG_DEL_HERE)) @@ -308,17 +301,8 @@ command before "make": delete_in_dir(the_file_list, fname, file, &st); return; } -@@ -1071,7 +1076,7 @@ static void recv_generator(char *fname, - } - - if (update_only && statret == 0 -- && 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", fname); - return; -@@ -1174,7 +1179,7 @@ static void recv_generator(char *fname, - if (fuzzy_basis) { +@@ -1252,7 +1259,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; @@ -326,17 +310,26 @@ command before "make": } /* open the file */ ---- orig/hlink.c 2006-01-14 20:27:09 -+++ hlink.c 2006-01-24 19:17:58 -@@ -26,6 +26,7 @@ extern int link_dest; - extern int make_backups; - extern int log_format_has_i; +@@ -1517,7 +1524,7 @@ void generate_files(int f_out, struct fi + continue; + if (!need_retouch_dir_times && file->mode & S_IWUSR) + continue; +- if (file->flags & FLAG_MISSING) { ++ if (FFLAGS(file) & FLAG_MISSING) { + int missing = file->dir.depth; + while (++i < flist->count) { + file = flist->files[i]; +--- old/hlink.c ++++ new/hlink.c +@@ -30,6 +30,7 @@ extern int make_backups; + extern int remove_source_files; + extern int stdout_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) +@@ -91,10 +92,10 @@ static void link_idev_data(void) FPTR(cur)->link_u.links = pool_talloc(hlink_pool, struct hlink, 1, "hlink_list"); @@ -346,10 +339,10 @@ command before "make": FPTR(cur)->F_NEXT = head; - FPTR(cur)->flags |= FLAG_HLINK_EOL; + FFLAGS(FPTR(cur)) |= FLAG_HLINK_EOL; + FPTR(cur)->link_u.links->link_dest_used = 0; hlink_list[to++] = head; } else - FPTR(cur)->link_u.links = NULL; -@@ -175,7 +176,7 @@ int hard_link_check(struct file_struct * +@@ -181,7 +182,7 @@ int hard_link_check(struct file_struct * { #ifdef SUPPORT_HARD_LINKS int head; @@ -358,7 +351,7 @@ command before "make": 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 +@@ -289,8 +290,8 @@ void hard_link_cluster(struct file_struc file->F_HLINDEX = FINISHED_LINK; if (link_stat(f_name(file, hlink1), &st1, 0) < 0) return; @@ -369,44 +362,37 @@ command before "make": 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); +@@ -310,6 +311,6 @@ void hard_link_cluster(struct file_struc + send_msg(MSG_SUCCESS, numbuf, 4); + } file->F_HLINDEX = FINISHED_LINK; - } while (!(file->flags & FLAG_HLINK_EOL)); + } while (!(FFLAGS(file) & FLAG_HLINK_EOL)); #endif } ---- orig/log.c 2006-01-24 22:24:32 -+++ log.c 2006-01-24 22:50:01 -@@ -38,6 +38,7 @@ extern int module_id; - extern int msg_fd_out; +--- old/log.c ++++ new/log.c +@@ -37,6 +37,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; -@@ -542,10 +543,12 @@ static void log_formatted(enum logcode c - n[3] = !(iflags & ITEM_REPORT_SIZE) ? '.' : 's'; - n[4] = !(iflags & ITEM_REPORT_TIME) ? '.' - : !preserve_times || S_ISLNK(file->mode) ? 'T' : 't'; -- n[5] = !(iflags & ITEM_REPORT_PERMS) ? '.' : 'p'; -- n[6] = !(iflags & ITEM_REPORT_OWNER) ? '.' : 'o'; -- n[7] = !(iflags & ITEM_REPORT_GROUP) ? '.' : 'g'; -- n[8] = '\0'; -+ n[5] = !(iflags & ITEM_REPORT_ATIME) ? '.' + extern int stdout_format_has_i; + extern int stdout_format_has_o_or_i; + extern int logfile_format_has_i; +@@ -606,7 +607,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[6] = !(iflags & ITEM_REPORT_PERMS) ? '.' : 'p'; -+ n[7] = !(iflags & ITEM_REPORT_OWNER) ? '.' : 'o'; -+ n[8] = !(iflags & ITEM_REPORT_GROUP) ? '.' : 'g'; -+ n[9] = '\0'; + n[9] = '\0'; if (iflags & (ITEM_IS_NEW|ITEM_MISSING_DATA)) { - char ch = iflags & ITEM_IS_NEW ? '+' : '?'; ---- orig/options.c 2006-01-23 18:48:23 -+++ options.c 2006-01-24 22:53:18 -@@ -50,6 +50,7 @@ int preserve_uid = 0; +--- old/options.c ++++ new/options.c +@@ -55,6 +55,7 @@ int preserve_uid = 0; int preserve_gid = 0; int preserve_times = 0; int omit_dir_times = 0; @@ -414,19 +400,19 @@ command before "make": int update_only = 0; int cvs_exclude = 0; int dry_run = 0; -@@ -291,8 +292,9 @@ void usage(enum logcode F) - rprintf(F," -o, --owner preserve owner (root only)\n"); - rprintf(F," -g, --group preserve group\n"); - rprintf(F," -D, --devices preserve devices (root only)\n"); +@@ -311,8 +312,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," --chmod=CHMOD change destination permissions\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"); -@@ -400,6 +402,9 @@ static struct poptOption long_options[] +@@ -428,6 +430,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 }, @@ -435,49 +421,52 @@ command before "make": + {"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 }, - {"owner", 'o', POPT_ARG_VAL, &preserve_uid, 1, 0, 0 }, -@@ -1468,6 +1473,8 @@ void server_options(char **args,int *arg + {"super", 0, POPT_ARG_VAL, &am_root, 2, 0, 0 }, +@@ -1538,6 +1543,8 @@ void server_options(char **args,int *arg argstr[x++] = 'D'; if (preserve_times) argstr[x++] = 't'; + if (preserve_atimes) + argstr[x++] = 'U'; - if (omit_dir_times == 2 && am_sender) - argstr[x++] = 'O'; if (preserve_perms) ---- orig/rsync.c 2006-01-24 19:03:07 -+++ rsync.c 2005-07-28 00:17:37 -@@ -27,6 +27,7 @@ extern int dry_run; - extern int daemon_log_format_has_i; + argstr[x++] = 'p'; + else if (preserve_executability && am_sender) +--- old/rsync.c ++++ new/rsync.c +@@ -34,6 +34,7 @@ extern int verbose; + extern int dry_run; + extern int preserve_perms; + extern int preserve_executability; ++extern int preserve_atimes; extern int preserve_times; extern int omit_dir_times; -+extern int preserve_atimes; extern int am_root; - extern int am_server; - extern int am_sender; -@@ -56,6 +57,7 @@ int set_perms(char *fname,struct file_st +@@ -129,6 +130,7 @@ int set_file_attrs(char *fname, struct f int updated = 0; STRUCT_STAT st2; int change_uid, change_gid; + time_t atime, mtime; + mode_t new_mode = file->mode; if (!st) { - if (dry_run) -@@ -70,16 +72,29 @@ int set_perms(char *fname,struct file_st +@@ -148,18 +150,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 |= PERMS_SKIP_MTIME; + flags |= ATTRS_SKIP_MTIME; + if (!preserve_atimes || S_ISDIR(st->st_mode)) -+ flags |= PERMS_SKIP_ATIME; - if (!(flags & PERMS_SKIP_MTIME) -- && cmp_modtime(st->st_mtime, file->modtime) != 0) { ++ 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); -+ && cmp_time(st->st_mtime, file->modtime) != 0) { + mtime = file->modtime; + updated = 1; + } else + mtime = st->st_mtime; -+ if (!(flags & PERMS_SKIP_ATIME) ++ if (!(flags & ATTRS_SKIP_ATIME) + && cmp_time(st->st_atime, file->atime) != 0) { + atime = file->atime; + updated = 1; @@ -496,9 +485,9 @@ command before "make": + updated = 0; } - change_uid = am_root && preserve_uid && st->st_uid != file->ids->uid; ---- orig/rsync.h 2006-01-24 19:03:07 -+++ rsync.h 2006-01-24 22:38:08 + change_uid = am_root && preserve_uid && st->st_uid != file->uid; +--- old/rsync.h ++++ new/rsync.h @@ -54,6 +54,7 @@ #define XMIT_HAS_IDEV_DATA (1<<9) #define XMIT_SAME_DEV (1<<10) @@ -507,25 +496,17 @@ command before "make": /* These flags are used in the live flist data. */ -@@ -119,6 +120,7 @@ +@@ -120,6 +121,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 -@@ -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) -@@ -524,9 +527,12 @@ struct file_struct { - struct id_pair *ids; - time_t modtime; +@@ -530,9 +532,12 @@ struct file_struct { + uid_t uid; + gid_t gid; mode_t mode; - uchar flags; /* this item MUST remain last */ + time_t atime; /* this MUST be second to last */ @@ -537,21 +518,21 @@ command before "make": /* * Start the flist array at FLIST_START entries and grow it * by doubling until FLIST_LINEAR then grow by FLIST_LINEAR ---- orig/rsync.yo 2006-01-24 22:19:58 -+++ rsync.yo 2006-01-24 22:54:23 -@@ -319,8 +319,9 @@ to the detailed description below for a - -o, --owner preserve owner (root only) - -g, --group preserve group - -D, --devices preserve devices (root only) +--- old/rsync.yo ++++ new/rsync.yo +@@ -328,8 +328,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 - --chmod=CHMOD change destination permissions + --super receiver attempts super-user activities -S, --sparse handle sparse files efficiently -n, --dry-run show what would have been transferred -@@ -711,6 +712,12 @@ it is preserving modification times (see +@@ -869,6 +870,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). @@ -561,10 +542,19 @@ command before "make": +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(--chmod)) This options tells rsync to apply the listed "chmod" pattern - to the permission of the files on the destination. In addition to the normal - parsing rules specified in the chmod manpage, you can specify an item that -@@ -1219,9 +1226,13 @@ quote(itemize( + 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 +@@ -1390,7 +1397,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. +@@ -1430,7 +1437,7 @@ quote(itemization( 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) @@ -572,33 +562,30 @@ command before "make": + 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 +@@ -1439,7 +1446,10 @@ quote(itemization( + 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 -+ anytime a symlink is transferred. - it() A bf(p) means the permissions are different and are being updated to - the sender's value (requires bf(--perms)). - it() An bf(o) means the owner is different and is being updated to the ---- orig/sender.c 2006-01-14 20:27:10 -+++ sender.c 2006-01-24 18:10:23 -@@ -38,6 +38,7 @@ extern int do_progress; ++ 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 +@@ -41,6 +41,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, + extern char *stdout_format; +@@ -373,7 +374,7 @@ void send_files(struct file_list *flist, rprintf(FINFO, "sender finished %s\n", fname); /* Flag that we actually sent this entry. */ @@ -607,8 +594,8 @@ command before "make": } make_backups = save_make_backups; ---- orig/testsuite/atimes.test 2006-01-24 22:54:53 -+++ testsuite/atimes.test 2006-01-24 22:54:53 +--- old/testsuite/atimes.test ++++ new/testsuite/atimes.test @@ -0,0 +1,19 @@ +#! /bin/sh + @@ -629,284 +616,18 @@ command before "make": + +# The script would have aborted on error, so getting here means we've won. +exit 0 ---- orig/testsuite/devices.test 2006-01-24 22:24:32 -+++ testsuite/devices.test 2006-01-24 22:32:30 -@@ -55,14 +55,14 @@ touch -r "$fromdir/block" "$fromdir/bloc - $RSYNC -ai "$fromdir/block" "$todir/block2" \ - | tee "$outfile" - cat <"$chkfile" --cD++++++ block -+cD+++++++ block - EOT - diff $diffopt "$chkfile" "$outfile" || test_fail "test 1 failed" - - $RSYNC -ai "$fromdir/block2" "$todir/block" \ - | tee "$outfile" - cat <"$chkfile" --cD++++++ block2 -+cD+++++++ block2 - EOT - diff $diffopt "$chkfile" "$outfile" || test_fail "test 2 failed" - -@@ -71,7 +71,7 @@ sleep 1 - $RSYNC -Di "$fromdir/block3" "$todir/block" \ - | tee "$outfile" - cat <"$chkfile" --cD..T... block3 -+cD..T.... block3 - EOT - diff $diffopt "$chkfile" "$outfile" || test_fail "test 3 failed" - -@@ -79,15 +79,15 @@ $RSYNC -aiHvv "$fromdir/" "$todir/" \ - | tee "$outfile" - filter_outfile - cat <"$chkfile" --.d..t... ./ --cD..t... block --cD...... block2 --cD++++++ block3 --hD++++++ block2.5 => block3 --cD++++++ char --cD++++++ char2 --cD++++++ char3 --cD++++++ fifo -+.d..t.... ./ -+cD..t.... block -+cD....... block2 -+cD+++++++ block3 -+hD+++++++ block2.5 => block3 -+cD+++++++ char -+cD+++++++ char2 -+cD+++++++ char3 -+cD+++++++ fifo - EOT - if test ! -b "$fromdir/block2.5"; then - sed -e '/block2\.5/d' \ ---- orig/testsuite/itemize.test 2006-01-24 22:24:32 -+++ testsuite/itemize.test 2006-01-24 22:32:03 -@@ -44,14 +44,14 @@ ln "$fromdir/foo/config1" "$fromdir/foo/ - $RSYNC -iplr "$fromdir/" "$todir/" \ - | tee "$outfile" - cat <"$chkfile" --cd++++++ bar/ --cd++++++ bar/baz/ -->f++++++ bar/baz/rsync --cd++++++ foo/ -->f++++++ foo/config1 -->f++++++ foo/config2 -->f++++++ foo/extra --cL++++++ foo/sym -> ../bar/baz/rsync -+cd+++++++ bar/ -+cd+++++++ bar/baz/ -+>f+++++++ bar/baz/rsync -+cd+++++++ foo/ -+>f+++++++ foo/config1 -+>f+++++++ foo/config2 -+>f+++++++ foo/extra -+cL+++++++ foo/sym -> ../bar/baz/rsync - EOT - diff $diffopt "$chkfile" "$outfile" || test_fail "test 1 failed" - -@@ -63,10 +63,10 @@ chmod 601 "$fromdir/foo/config2" - $RSYNC -iplrH "$fromdir/" "$todir/" \ - | tee "$outfile" - cat <"$chkfile" -->f..T... bar/baz/rsync -->f..T... foo/config1 -->f.sTp.. foo/config2 --hf..T... foo/extra => foo/config1 -+>f..T.... bar/baz/rsync -+>f..T.... foo/config1 -+>f.sT.p.. foo/config2 -+hf..T.... foo/extra => foo/config1 - EOT - diff $diffopt "$chkfile" "$outfile" || test_fail "test 2 failed" - -@@ -83,11 +83,11 @@ chmod 777 "$todir/bar/baz/rsync" - $RSYNC -iplrtc "$fromdir/" "$todir/" \ - | tee "$outfile" - cat <"$chkfile" --.f..tp.. bar/baz/rsync --.d..t... foo/ --.f..t... foo/config1 -->fcstp.. foo/config2 --cL..T... foo/sym -> ../bar/baz/rsync -+.f..t.p.. bar/baz/rsync -+.d..t.... foo/ -+.f..t.... foo/config1 -+>fcst.p.. foo/config2 -+cL..T.... foo/sym -> ../bar/baz/rsync - EOT - diff $diffopt "$chkfile" "$outfile" || test_fail "test 3 failed" - -@@ -112,15 +112,15 @@ $RSYNC -ivvplrtH "$fromdir/" "$todir/" \ - | tee "$outfile" - filter_outfile - cat <"$chkfile" --.d ./ --.d bar/ --.d bar/baz/ --.f...p.. bar/baz/rsync --.d foo/ --.f foo/config1 -->f..t... foo/config2 --hf foo/extra --.L foo/sym -> ../bar/baz/rsync -+.d ./ -+.d bar/ -+.d bar/baz/ -+.f....p.. bar/baz/rsync -+.d foo/ -+.f foo/config1 -+>f..t.... foo/config2 -+hf foo/extra -+.L foo/sym -> ../bar/baz/rsync - EOT - diff $diffopt "$chkfile" "$outfile" || test_fail "test 5 failed" - -@@ -139,8 +139,8 @@ touch "$todir/foo/config2" - $RSYNC -iplrtH "$fromdir/" "$todir/" \ - | tee "$outfile" - cat <"$chkfile" --.f...p.. foo/config1 -->f..t... foo/config2 -+.f....p.. foo/config1 -+>f..t.... foo/config2 - EOT - diff $diffopt "$chkfile" "$outfile" || test_fail "test 7 failed" - -@@ -149,15 +149,15 @@ $RSYNC -ivvplrtH --copy-dest="$lddir" "$ - | tee "$outfile" - filter_outfile - cat <"$chkfile" --.d..t... ./ --cd++++++ bar/ --cd++++++ bar/baz/ --cf bar/baz/rsync --cd++++++ foo/ --cf foo/config1 --cf foo/config2 --hf foo/extra => foo/config1 --cL..T... foo/sym -> ../bar/baz/rsync -+.d..t.... ./ -+cd+++++++ bar/ -+cd+++++++ bar/baz/ -+cf bar/baz/rsync -+cd+++++++ foo/ -+cf foo/config1 -+cf foo/config2 -+hf foo/extra => foo/config1 -+cL..T.... foo/sym -> ../bar/baz/rsync - EOT - diff $diffopt "$chkfile" "$outfile" || test_fail "test 8 failed" - -@@ -165,11 +165,11 @@ rm -rf "$todir" - $RSYNC -iplrtH --copy-dest="$lddir" "$fromdir/" "$todir/" \ - | tee "$outfile" - cat <"$chkfile" --.d..t... ./ --cd++++++ bar/ --cd++++++ bar/baz/ --cd++++++ foo/ --hf foo/extra => foo/config1 -+.d..t.... ./ -+cd+++++++ bar/ -+cd+++++++ bar/baz/ -+cd+++++++ foo/ -+hf foo/extra => foo/config1 - EOT - diff $diffopt "$chkfile" "$outfile" || test_fail "test 9 failed" - -@@ -196,15 +196,15 @@ $RSYNC -ivvplrtH --link-dest="$lddir" "$ - | tee "$outfile" - filter_outfile - cat <"$chkfile" --.d..t... ./ --cd++++++ bar/ --cd++++++ bar/baz/ --hf bar/baz/rsync --cd++++++ foo/ --hf foo/config1 --hf foo/config2 --hf foo/extra => foo/config1 --hL foo/sym -> ../bar/baz/rsync -+.d..t.... ./ -+cd+++++++ bar/ -+cd+++++++ bar/baz/ -+hf bar/baz/rsync -+cd+++++++ foo/ -+hf foo/config1 -+hf foo/config2 -+hf foo/extra => foo/config1 -+hL foo/sym -> ../bar/baz/rsync - EOT - diff $diffopt "$chkfile" "$outfile" || test_fail "test 11 failed" - -@@ -212,10 +212,10 @@ rm -rf "$todir" - $RSYNC -iplrtH --link-dest="$lddir" "$fromdir/" "$todir/" \ - | tee "$outfile" - cat <"$chkfile" --.d..t... ./ --cd++++++ bar/ --cd++++++ bar/baz/ --cd++++++ foo/ -+.d..t.... ./ -+cd+++++++ bar/ -+cd+++++++ bar/baz/ -+cd+++++++ foo/ - EOT - diff $diffopt "$chkfile" "$outfile" || test_fail "test 12 failed" - -@@ -243,14 +243,14 @@ filter_outfile - # TODO fix really-old problem when combining -H with --compare-dest: - # missing output for foo/extra hard-link (and it might not be updated)! - cat <"$chkfile" --.d..t... ./ --cd++++++ bar/ --cd++++++ bar/baz/ --.f bar/baz/rsync --cd++++++ foo/ --.f foo/config1 --.f foo/config2 --.L foo/sym -> ../bar/baz/rsync -+.d..t.... ./ -+cd+++++++ bar/ -+cd+++++++ bar/baz/ -+.f bar/baz/rsync -+cd+++++++ foo/ -+.f foo/config1 -+.f foo/config2 -+.L foo/sym -> ../bar/baz/rsync - EOT - diff $diffopt "$chkfile" "$outfile" || test_fail "test 14 failed" - -@@ -258,10 +258,10 @@ rm -rf "$todir" - $RSYNC -iplrtH --compare-dest="$lddir" "$fromdir/" "$todir/" \ - | tee "$outfile" - cat <"$chkfile" --.d..t... ./ --cd++++++ bar/ --cd++++++ bar/baz/ --cd++++++ foo/ -+.d..t.... ./ -+cd+++++++ bar/ -+cd+++++++ bar/baz/ -+cd+++++++ foo/ - EOT - diff $diffopt "$chkfile" "$outfile" || test_fail "test 15 failed" - ---- orig/testsuite/rsync.fns 2005-06-10 21:33:28 -+++ testsuite/rsync.fns 2005-07-28 00:41:20 -@@ -50,7 +50,7 @@ printmsg() { - +--- old/testsuite/rsync.fns ++++ new/testsuite/rsync.fns +@@ -66,7 +66,7 @@ printmsg() { + } rsync_ls_lR() { - find "$@" -print | sort | sed 's/ /\\ /g' | xargs "$TOOLDIR/tls" + find "$@" -print | sort | sed 's/ /\\ /g' | xargs "$TOOLDIR/tls" $TLS_ARGS } - rsync_getgroups() { -@@ -158,6 +158,10 @@ 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. @@ -917,7 +638,7 @@ command before "make": echo "Running: \"$1\"" eval "$1" status=$? -@@ -165,10 +169,13 @@ checkit() { +@@ -191,10 +195,13 @@ checkit() { failed="YES"; fi @@ -932,45 +653,46 @@ command before "make": ( cd "$3" && rsync_ls_lR . ) > "$tmpdir/ls-to" diff $diffopt "$tmpdir/ls-from" "$tmpdir/ls-to" || failed=YES ---- orig/tls.c 2005-09-24 17:40:31 -+++ tls.c 2005-03-23 17:49:48 -@@ -39,6 +39,7 @@ - +--- old/tls.c ++++ new/tls.c +@@ -34,6 +34,7 @@ + * change. */ #include "rsync.h" +#include "popt.h" #define PROGRAM "tls" -@@ -48,6 +49,7 @@ int read_only = 1; +@@ -43,6 +44,8 @@ int read_only = 1; int list_only = 0; int preserve_perms = 0; +static int display_atime = 0; - ++ static void failed(char const *what, char const *where) { -@@ -56,14 +58,29 @@ static void failed(char const *what, cha + fprintf(stderr, PROGRAM ": %s %s: %s\n", +@@ -50,12 +53,29 @@ static void failed(char const *what, cha exit(1); } -+static void storetime(char *dest, time_t t) ++static void storetime(char *dest, time_t t, size_t destsize) +{ + if (t) { + struct tm *mt = gmtime(&t); - -+ sprintf(dest, "%04d-%02d-%02d %02d:%02d:%02d ", ++ ++ snprintf(dest, destsize, ++ "%04d-%02d-%02d %02d:%02d:%02d ", + (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, " "); -+ } -+} - ++ } else ++ strlcpy(dest, " ", destsize); ++} ++ static void list_file(const char *fname) { STRUCT_STAT buf; @@ -982,29 +704,29 @@ command before "make": char linkbuf[4096]; if (do_lstat(fname, &buf) < 0) -@@ -96,19 +113,8 @@ static void list_file(const char *fname) +@@ -88,19 +108,8 @@ static void list_file(const char *fname) permstring(permbuf, buf.st_mode); - if (buf.st_mtime) { - mt = gmtime(&buf.st_mtime); - -- sprintf(datebuf, "%04d-%02d-%02d %02d:%02d:%02d", +- snprintf(datebuf, sizeof datebuf, +- "%04d-%02d-%02d %02d:%02d:%02d", - (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, " "); -- } -+ storetime(mtimebuf, buf.st_mtime); -+ storetime(atimebuf, buf.st_atime); +- } else +- strlcpy(datebuf, " ", sizeof datebuf); ++ storetime(mtimebuf, buf.st_mtime, sizeof mtimebuf); ++ storetime(atimebuf, buf.st_atime, sizeof atimebuf); /* TODO: Perhaps escape special characters in fname? */ -@@ -119,24 +125,55 @@ static void list_file(const char *fname) +@@ -111,23 +120,55 @@ static void list_file(const char *fname) (long)minor(buf.st_rdev)); } else /* NB: use double for size since it might not fit in a long. */ printf("%12.0f", (double)buf.st_size); @@ -1014,8 +736,8 @@ command before "make": - datebuf, fname, linkbuf); + mtimebuf, display_atime && !S_ISDIR(buf.st_mode) ? atimebuf : "", + fname, linkbuf); - } - ++} ++ +static struct poptOption long_options[] = { + /* longName, shortName, argInfo, argPtr, value, descrip, argDesc */ + {"atime", 'u', POPT_ARG_NONE, &display_atime, 0, 0, 0}, @@ -1028,7 +750,7 @@ command before "make": + fprintf(stderr, "usage: " PROGRAM " [--atime | -u] DIR ...\n" + "Trivial file listing program for portably checking rsync\n"); + exit(ret); -+} + } int main(int argc, char *argv[]) @@ -1037,10 +759,13 @@ command before "make": - fprintf(stderr, "usage: " PROGRAM " DIR ...\n" - "Trivial file listing program for portably checking rsync\n"); - return 1; +- } + poptContext pc; + const char **extra_args; + int opt; -+ + +- for (argv++; *argv; argv++) { +- list_file(*argv); + pc = poptGetContext(PROGRAM, argc, (const char **)argv, + long_options, 0); + while ((opt = poptGetNextOpt(pc)) != -1) { @@ -1056,9 +781,6 @@ command before "make": + } } -- for (argv++; *argv; argv++) { -- list_file(*argv); -- } + extra_args = poptGetArgs(pc); + if (*extra_args == NULL) + tls_usage(1); @@ -1066,21 +788,21 @@ command before "make": + for (; *extra_args; extra_args++) + list_file(*extra_args); + poptFreeContext(pc); - ++ return 0; } ---- orig/util.c 2006-01-20 00:12:48 -+++ util.c 2006-01-14 08:20:29 -@@ -130,7 +130,7 @@ void overflow_exit(char *str) - - +--- old/util.c ++++ new/util.c +@@ -121,7 +121,7 @@ NORETURN void overflow_exit(char *str) + exit_cleanup(RERR_MALLOC); + } -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 !defined HAVE_LUTIMES || !defined HAVE_UTIMES if (S_ISLNK(mode)) -@@ -138,9 +138,13 @@ int set_modtime(char *fname, time_t modt +@@ -129,9 +129,13 @@ int set_modtime(char *fname, time_t modt #endif if (verbose > 2) { @@ -1096,7 +818,7 @@ command before "make": } if (dry_run) -@@ -149,7 +153,7 @@ int set_modtime(char *fname, time_t modt +@@ -140,7 +144,7 @@ int set_modtime(char *fname, time_t modt { #ifdef HAVE_UTIMES struct timeval t[2]; @@ -1105,7 +827,7 @@ command before "make": t[0].tv_usec = 0; t[1].tv_sec = modtime; t[1].tv_usec = 0; -@@ -160,12 +164,12 @@ int set_modtime(char *fname, time_t modt +@@ -151,12 +155,12 @@ int set_modtime(char *fname, time_t modt return utimes(fname, t); #elif defined HAVE_UTIMBUF struct utimbuf tbuf; @@ -1120,23 +842,3 @@ command before "make": t[1] = modtime; return utime(fname,t); #else -@@ -1175,8 +1179,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 -@@ -1185,7 +1189,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)