--- old/flist.c
+++ new/flist.c
-@@ -51,6 +51,7 @@ extern int preserve_devices;
+@@ -46,6 +46,7 @@ extern int preserve_devices;
extern int preserve_specials;
extern int preserve_uid;
extern int preserve_gid;
extern int relative_paths;
extern int implied_dirs;
extern int prune_empty_dirs;
-@@ -85,7 +86,13 @@ void init_flist(void)
+@@ -79,7 +80,13 @@ void init_flist(void)
struct file_struct f;
/* Figure out how big the file_struct is without trailing padding */
checksum_len = protocol_version < 21 ? 2 : MD4_SUM_LENGTH;
}
-@@ -141,16 +148,18 @@ static void list_file_entry(struct file_
+@@ -135,16 +142,18 @@ static void list_file_entry(struct file_
#ifdef SUPPORT_LINKS
if (preserve_links && S_ISLNK(f->mode)) {
f_name(f, NULL));
}
}
-@@ -312,6 +321,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;
static mode_t mode;
static int64 dev;
static dev_t rdev;
-@@ -327,7 +337,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;
-@@ -339,7 +349,7 @@ static void send_file_entry(struct file_
+@@ -327,7 +337,7 @@ static void send_file_entry(struct file_
f_name(file, fname);
if (file->mode == mode)
flags |= XMIT_SAME_MODE;
-@@ -375,6 +385,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;
#ifdef SUPPORT_HARD_LINKS
if (file->link_u.idev) {
-@@ -428,6 +444,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));
if (preserve_uid && !(flags & XMIT_SAME_UID)) {
if (!numeric_ids)
add_uid(uid);
-@@ -496,6 +514,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;
static mode_t mode;
static int64 dev;
static dev_t rdev;
-@@ -514,7 +533,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;
-@@ -570,6 +589,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));
if (chmod_modes && !S_ISLNK(mode))
mode = tweak_mode(mode, chmod_modes);
-@@ -625,6 +646,8 @@ static struct file_struct *receive_file_
+@@ -611,6 +632,8 @@ static struct file_struct *receive_file_
file->mode = mode;
file->uid = uid;
file->gid = gid;
if (dirname_len) {
file->dirname = lastdir = bp;
-@@ -650,12 +673,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;
else
in_del_hier = 0;
}
-@@ -871,12 +894,14 @@ 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;
#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)
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
+@@ -1586,8 +1611,9 @@ static void clean_flist(struct file_list
}
/* Make sure we don't lose track of a user-specified
* top directory. */
clear_file(flist->files[drop], flist);
-@@ -1720,7 +1746,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,
--- old/generator.c
+++ new/generator.c
-@@ -44,6 +44,7 @@ extern int preserve_perms;
+@@ -43,6 +43,7 @@ extern int preserve_perms;
extern int preserve_uid;
extern int preserve_gid;
extern int preserve_times;
extern int omit_dir_times;
extern int delete_mode;
extern int delete_before;
-@@ -91,6 +92,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;
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
+@@ -182,7 +184,7 @@ static int delete_item(char *fname, int
for (j = dirlist->count; j--; ) {
struct file_struct *fp = dirlist->files[j];
continue;
strlcpy(p, fp->basename, remainder);
-@@ -263,7 +265,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) {
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
+@@ -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];
continue;
if (flist_find(flist, fp) < 0) {
f_name(fp, delbuf);
-@@ -301,11 +303,11 @@ static void do_delete_pass(struct file_l
+@@ -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];
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
+@@ -346,6 +348,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 ((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
+@@ -549,7 +554,7 @@ static int find_fuzzy(struct file_struct
uint32 dist;
if (!S_ISREG(fp->mode) || !fp->length
continue;
name = fp->basename;
-@@ -659,6 +664,8 @@ static int try_dests_reg(struct file_str
+@@ -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)
- hard_link_cluster(file, ndx, itemizing, code);
- } else if (itemizing)
-@@ -894,7 +901,7 @@ static void recv_generator(char *fname,
- && verbose && code && f_out != -1)
+ 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))
delete_in_dir(the_file_list, fname, file, &st);
return;
}
-@@ -1176,7 +1183,7 @@ static void recv_generator(char *fname,
- if (fuzzy_basis) {
+@@ -1249,7 +1256,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;
}
/* open the file */
+@@ -1514,7 +1521,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
-@@ -26,6 +26,7 @@ extern int link_dest;
- extern int make_backups;
- extern int log_format_has_i;
+@@ -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");
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;
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;
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));
}
--- old/log.c
+++ new/log.c
-@@ -42,6 +42,7 @@ extern int msg_fd_out;
+@@ -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;
-@@ -605,10 +606,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 ? '+' : '?';
--- old/options.c
+++ new/options.c
-@@ -52,6 +52,7 @@ int preserve_uid = 0;
+@@ -55,6 +55,7 @@ int preserve_uid = 0;
int preserve_gid = 0;
int preserve_times = 0;
int omit_dir_times = 0;
int update_only = 0;
int cvs_exclude = 0;
int dry_run = 0;
-@@ -300,8 +301,9 @@ void usage(enum logcode F)
+@@ -309,8 +310,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," --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");
-@@ -414,6 +416,9 @@ static struct poptOption long_options[]
+@@ -424,6 +426,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 },
{"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 },
-@@ -1508,6 +1513,8 @@ void server_options(char **args,int *arg
+@@ -1534,6 +1539,8 @@ void server_options(char **args,int *arg
argstr[x++] = 'D';
if (preserve_times)
argstr[x++] = 't';
else if (preserve_executability && am_sender)
--- old/rsync.c
+++ new/rsync.c
-@@ -37,6 +37,7 @@ extern int preserve_perms;
+@@ -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 orig_umask;
extern int am_root;
- extern int am_server;
-@@ -125,6 +126,7 @@ int set_file_attrs(char *fname, struct f
+@@ -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)
-@@ -143,18 +145,33 @@ int set_file_attrs(char *fname, struct f
+@@ -148,18 +150,33 @@ int set_file_attrs(char *fname, struct f
}
}
/* These flags are used in the live flist data. */
-@@ -119,6 +120,7 @@
+@@ -120,6 +121,7 @@
#define ATTRS_REPORT (1<<0)
#define ATTRS_SKIP_MTIME (1<<1)
#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)
-@@ -520,9 +523,12 @@ struct file_struct {
+@@ -530,9 +532,12 @@ struct file_struct {
uid_t uid;
gid_t gid;
mode_t mode;
* by doubling until FLIST_LINEAR then grow by FLIST_LINEAR
--- old/rsync.yo
+++ new/rsync.yo
-@@ -323,8 +323,9 @@ to the detailed description below for a
+@@ -327,8 +327,9 @@ to the detailed description below for a
--devices preserve device files (super-user only)
--specials preserve special files
-D same as --devices --specials
--super receiver attempts super-user activities
-S, --sparse handle sparse files efficiently
-n, --dry-run show what would have been transferred
-@@ -801,6 +802,12 @@ it is preserving modification times (see
+@@ -861,6 +862,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(--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
-@@ -1308,8 +1315,8 @@ if the receiving rsync is at least versi
- with older versions of rsync, but that also turns on the output of other
+@@ -1382,7 +1389,7 @@ with older versions of rsync, but that a
verbose messages).
--The "%i" escape has a cryptic output that is 8 letters long. The general
--format is like the string bf(YXcstpog), where bf(Y) is replaced by the
-+The "%i" escape has a cryptic output that is 9 letters long. The general
-+format is like the string bf(YXcstupog), where bf(Y) is replaced by the
- kind of update being done, bf(X) is replaced by the file-type, and the
+ 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.
-@@ -1349,9 +1356,13 @@ quote(itemize(
+@@ -1422,7 +1429,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)
+ 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
+@@ -1431,7 +1438,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
++ 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;
+@@ -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. */
+
+# The script would have aborted on error, so getting here means we've won.
+exit 0
---- old/testsuite/devices.test
-+++ new/testsuite/devices.test
-@@ -42,14 +42,14 @@ touch -r "$fromdir/block" "$fromdir/bloc
- $RSYNC -ai "$fromdir/block" "$todir/block2" \
- | tee "$outfile"
- cat <<EOT >"$chkfile"
--cD++++++ block
-+cD+++++++ block
- EOT
- diff $diffopt "$chkfile" "$outfile" || test_fail "test 1 failed"
-
- $RSYNC -ai "$fromdir/block2" "$todir/block" \
- | tee "$outfile"
- cat <<EOT >"$chkfile"
--cD++++++ block2
-+cD+++++++ block2
- EOT
- diff $diffopt "$chkfile" "$outfile" || test_fail "test 2 failed"
-
-@@ -58,7 +58,7 @@ sleep 1
- $RSYNC -Di "$fromdir/block3" "$todir/block" \
- | tee "$outfile"
- cat <<EOT >"$chkfile"
--cD..T... block3
-+cD..T.... block3
- EOT
- diff $diffopt "$chkfile" "$outfile" || test_fail "test 3 failed"
-
-@@ -66,15 +66,15 @@ $RSYNC -aiHvv "$fromdir/" "$todir/" \
- | tee "$outfile"
- filter_outfile
- cat <<EOT >"$chkfile"
--.d..t... ./
--cD..t... block
--cD...... block2
--cD++++++ block3
--hD++++++ block2.5 => block3
--cD++++++ char
--cD++++++ char2
--cD++++++ char3
--cS++++++ fifo
-+.d..t.... ./
-+cD..t.... block
-+cD....... block2
-+cD+++++++ block3
-+hD+++++++ block2.5 => block3
-+cD+++++++ char
-+cD+++++++ char2
-+cD+++++++ char3
-+cS+++++++ fifo
- EOT
- if test ! -b "$fromdir/block2.5"; then
- sed -e '/block2\.5/d' \
---- old/testsuite/itemize.test
-+++ new/testsuite/itemize.test
-@@ -29,14 +29,14 @@ ln "$fromdir/foo/config1" "$fromdir/foo/
- $RSYNC -iplr "$fromdir/" "$todir/" \
- | tee "$outfile"
- cat <<EOT >"$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"
-
-@@ -48,10 +48,10 @@ chmod 601 "$fromdir/foo/config2"
- $RSYNC -iplrH "$fromdir/" "$todir/" \
- | tee "$outfile"
- cat <<EOT >"$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"
-
-@@ -68,11 +68,11 @@ chmod 777 "$todir/bar/baz/rsync"
- $RSYNC -iplrtc "$fromdir/" "$todir/" \
- | tee "$outfile"
- cat <<EOT >"$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"
-
-@@ -97,15 +97,15 @@ $RSYNC -ivvplrtH "$fromdir/" "$todir/" \
- | tee "$outfile"
- filter_outfile
- cat <<EOT >"$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"
-
-@@ -124,8 +124,8 @@ touch "$todir/foo/config2"
- $RSYNC -iplrtH "$fromdir/" "$todir/" \
- | tee "$outfile"
- cat <<EOT >"$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"
-
-@@ -134,15 +134,15 @@ $RSYNC -ivvplrtH --copy-dest="$lddir" "$
- | tee "$outfile"
- filter_outfile
- cat <<EOT >"$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"
-
-@@ -150,11 +150,11 @@ rm -rf "$todir"
- $RSYNC -iplrtH --copy-dest="$lddir" "$fromdir/" "$todir/" \
- | tee "$outfile"
- cat <<EOT >"$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"
-
-@@ -181,15 +181,15 @@ $RSYNC -ivvplrtH --link-dest="$lddir" "$
- | tee "$outfile"
- filter_outfile
- cat <<EOT >"$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"
-
-@@ -197,10 +197,10 @@ rm -rf "$todir"
- $RSYNC -iplrtH --link-dest="$lddir" "$fromdir/" "$todir/" \
- | tee "$outfile"
- cat <<EOT >"$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"
-
-@@ -228,14 +228,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 <<EOT >"$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"
-
-@@ -243,10 +243,10 @@ rm -rf "$todir"
- $RSYNC -iplrtH --compare-dest="$lddir" "$fromdir/" "$todir/" \
- | tee "$outfile"
- cat <<EOT >"$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"
-
--- old/testsuite/rsync.fns
+++ new/testsuite/rsync.fns
@@ -66,7 +66,7 @@ printmsg() {
--- old/tls.c
+++ new/tls.c
-@@ -39,6 +39,7 @@
-
+@@ -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;
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);
- 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},
+ 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[])
}
--- old/util.c
+++ new/util.c
-@@ -125,7 +125,7 @@ void overflow_exit(char *str)
+@@ -121,7 +121,7 @@ NORETURN void overflow_exit(char *str)
exit_cleanup(RERR_MALLOC);
}
{
#if !defined HAVE_LUTIMES || !defined HAVE_UTIMES
if (S_ISLNK(mode))
-@@ -133,9 +133,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) {
}
if (dry_run)
-@@ -144,7 +148,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];
t[0].tv_usec = 0;
t[1].tv_sec = modtime;
t[1].tv_usec = 0;
-@@ -155,12 +159,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;