make proto
---- orig/batch.c 2004-08-02 05:02:24
+--- orig/batch.c 2005-03-27 05:13:14
+++ batch.c 2004-07-03 20:15:41
-@@ -184,6 +184,8 @@ void show_flist(int index, struct file_s
+@@ -207,6 +207,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->length=%.0f\n",
(double) fptr[i]->length);
rprintf(FINFO, "flist->mode=%#o\n", (int) fptr[i]->mode);
---- orig/flist.c 2005-01-25 00:53:58
-+++ flist.c 2004-07-03 20:15:41
-@@ -63,6 +63,7 @@ extern int make_backups;
- extern int backup_suffix_len;
+--- orig/flist.c 2005-03-16 02:19:29
++++ flist.c 2005-02-07 21:06:04
+@@ -54,6 +54,7 @@ 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;
-@@ -147,17 +148,17 @@ static void list_file_entry(struct file_
+ extern int orig_umask;
+@@ -140,16 +141,18 @@ static void list_file_entry(struct file_
- #if SUPPORT_LINKS
+ #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,
(double)f->length, timestring(f->modtime),
-- f_name(f), f->u.link);
-+ timestring(f->atime), f_name(f), f->u.link);
++ timestring(f->atime),
+ safe_fname(f_name(f)), safe_fname(f->u.link));
} else
#endif
{
+ rprintf(FINFO, "%s %11.0f %s %s %s\n",
perms,
(double)f->length, timestring(f->modtime),
-- f_name(f));
-+ timestring(f->atime), f_name(f));
++ timestring(f->atime),
+ safe_fname(f_name(f)));
}
}
-
-@@ -333,6 +334,7 @@ void send_file_entry(struct file_struct
+@@ -313,6 +316,7 @@ void send_file_entry(struct file_struct
{
unsigned short flags;
static time_t modtime;
static mode_t mode;
static int64 dev;
static dev_t rdev;
-@@ -348,7 +350,7 @@ void send_file_entry(struct file_struct
+@@ -328,7 +332,7 @@ void send_file_entry(struct file_struct
if (!file) {
write_byte(f, 0);
dev = 0, rdev = makedev(0, 0);
rdev_major = 0;
uid = 0, gid = 0;
-@@ -397,6 +399,12 @@ void send_file_entry(struct file_struct
+@@ -377,6 +381,12 @@ void send_file_entry(struct file_struct
flags |= XMIT_SAME_TIME;
else
modtime = file->modtime;
+ atime = file->atime;
+ }
- #if SUPPORT_HARD_LINKS
+ #ifdef SUPPORT_HARD_LINKS
if (file->link_u.idev) {
-@@ -452,6 +460,8 @@ void send_file_entry(struct file_struct
+@@ -432,6 +442,8 @@ void send_file_entry(struct file_struct
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);
-@@ -525,6 +535,7 @@ void receive_file_entry(struct file_stru
- struct file_list *flist, int f)
+@@ -505,6 +517,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 int64 dev;
static dev_t rdev;
-@@ -543,7 +554,7 @@ void receive_file_entry(struct file_stru
+@@ -523,7 +536,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;
-@@ -599,6 +610,8 @@ void receive_file_entry(struct file_stru
+@@ -579,6 +592,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 (preserve_uid && !(flags & XMIT_SAME_UID))
uid = (uid_t)read_int(f);
-@@ -649,6 +662,7 @@ void receive_file_entry(struct file_stru
+@@ -629,6 +644,7 @@ static struct file_struct *receive_file_
file->flags = 0;
file->modtime = modtime;
file->length = file_length;
file->mode = mode;
file->uid = uid;
-@@ -889,6 +903,7 @@ skip_excludes:
+@@ -878,6 +894,7 @@ skip_filters:
file->flags = flags;
file->modtime = st.st_mtime;
file->length = st.st_size;
file->mode = st.st_mode;
file->uid = st.st_uid;
---- orig/generator.c 2005-01-24 06:20:37
+--- orig/generator.c 2005-03-29 01:05:12
+++ generator.c 2004-11-03 23:02:12
-@@ -99,7 +99,7 @@ static int unchanged_file(char *fn, stru
+@@ -372,7 +372,7 @@ static int unchanged_file(char *fn, stru
if (ignore_times)
return 0;
}
-@@ -499,7 +499,7 @@ static void recv_generator(char *fname,
+@@ -837,7 +837,7 @@ static void recv_generator(char *fname,
}
- if (update_only && fnamecmp_type == FNAMECMP_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", safe_fname(fname));
return;
---- orig/options.c 2005-01-25 03:26:51
-+++ options.c 2005-01-24 01:51:48
-@@ -49,6 +49,7 @@ int preserve_uid = 0;
+--- orig/options.c 2005-03-28 20:56:55
++++ options.c 2005-02-21 10:53:28
+@@ -50,6 +50,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;
-@@ -266,6 +267,7 @@ void usage(enum logcode F)
+@@ -285,6 +286,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," -O, --omit-dir-times omit directories when preserving times\n");
rprintf(F," -S, --sparse handle sparse files efficiently\n");
rprintf(F," -n, --dry-run show what would have been transferred\n");
-@@ -382,6 +384,7 @@ static struct poptOption long_options[]
+@@ -410,6 +412,7 @@ static struct poptOption long_options[]
{"devices", 'D', POPT_ARG_NONE, &preserve_devices, 0, 0, 0 },
{"times", 't', POPT_ARG_NONE, &preserve_times, 0, 0, 0 },
- {"omit-dir-times", 'O', POPT_ARG_NONE, &omit_dir_times, 0, 0, 0 },
+ {"omit-dir-times", 'O', POPT_ARG_VAL, &omit_dir_times, 2, 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 },
-@@ -1128,6 +1131,8 @@ void server_options(char **args,int *arg
+@@ -1273,6 +1276,8 @@ void server_options(char **args,int *arg
argstr[x++] = 'D';
if (preserve_times)
argstr[x++] = 't';
+ if (copy_atimes)
+ argstr[x++] = 'A';
- if (omit_dir_times && am_sender)
+ if (omit_dir_times == 2 && am_sender)
argstr[x++] = 'O';
if (preserve_perms)
---- orig/rsync.c 2005-01-24 00:57:24
-+++ rsync.c 2005-01-24 01:59:12
-@@ -26,6 +26,7 @@ extern int verbose;
- extern int dry_run;
+--- orig/rsync.c 2005-03-16 02:19:30
++++ rsync.c 2005-02-21 10:57:03
+@@ -27,6 +27,7 @@ extern int dry_run;
+ extern int daemon_log_format_has_i;
extern int preserve_times;
extern int omit_dir_times;
+extern int copy_atimes;
extern int am_root;
+ extern int am_server;
extern int am_sender;
- extern int am_generator;
-@@ -153,6 +154,7 @@ int set_perms(char *fname,struct file_st
+@@ -56,6 +57,7 @@ int set_perms(char *fname,struct file_st
int updated = 0;
STRUCT_STAT st2;
int change_uid, change_gid;
if (!st) {
if (dry_run)
-@@ -165,18 +167,28 @@ int set_perms(char *fname,struct file_st
+@@ -68,17 +70,27 @@ int set_perms(char *fname,struct file_st
st = &st2;
}
+ if (!copy_atimes || S_ISLNK(st->st_mode) || S_ISDIR(st->st_mode))
+ flags |= PERMS_SKIP_ATIME;
if (!preserve_times || S_ISLNK(st->st_mode)
- || (S_ISDIR(st->st_mode)
- && (omit_dir_times || (make_backups && !backup_dir))))
+ || (S_ISDIR(st->st_mode) && omit_dir_times))
flags |= PERMS_SKIP_MTIME;
+ if (!(flags & PERMS_SKIP_ATIME)
+ && cmp_time(st->st_atime, file->atime) != 0) {
}
change_uid = am_root && preserve_uid && st->st_uid != file->uid;
---- orig/rsync.h 2005-01-25 00:53:58
+--- orig/rsync.h 2005-03-28 20:56:55
+++ rsync.h 2004-07-03 20:15:41
@@ -54,6 +54,7 @@
#define XMIT_HAS_IDEV_DATA (1<<9)
/* These flags are used in the live flist data. */
-@@ -117,6 +118,7 @@
+@@ -118,6 +119,7 @@
#define PERMS_REPORT (1<<0)
#define PERMS_SKIP_MTIME (1<<1)
#define FULL_FLUSH 1
#define NORMAL_FLUSH 0
-@@ -435,6 +437,7 @@ struct file_struct {
+@@ -510,6 +512,7 @@ struct file_struct {
struct hlink *links;
} link_u;
time_t modtime;
uid_t uid;
gid_t gid;
mode_t mode;
---- orig/rsync.yo 2005-01-25 03:26:51
+--- orig/rsync.yo 2005-03-28 20:56:55
+++ rsync.yo 2005-01-24 01:57:18
-@@ -332,6 +332,7 @@ verb(
+@@ -321,6 +321,7 @@ to the detailed description below for a
-D, --devices preserve devices (root only)
-t, --times preserve times
-O, --omit-dir-times omit directories when preserving times
+ -A, --copy-atimes copy access times
-S, --sparse handle sparse files efficiently
-n, --dry-run show what would have been transferred
- -W, --whole-file copy whole files, no incremental checks
-@@ -648,6 +649,11 @@ dit(bf(-O, --omit-dir-times)) This tells
- it is preserving modification times (see --times). If NFS is sharing
- the directories on the receiving side, it is a good idea to use -O.
+ -W, --whole-file copy files whole (without rsync algorithm)
+@@ -655,6 +656,11 @@ 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(-A, --copy-atimes)) This tells rsync to transfer access times
+along with the files and update them on the remote system. Note that
+
+# The script would have aborted on error, so getting here means we've won.
+exit 0
---- orig/testsuite/rsync.fns 2004-09-18 01:49:34
-+++ testsuite/rsync.fns 2004-07-03 20:15:41
+--- orig/testsuite/rsync.fns 2005-02-21 07:26:59
++++ testsuite/rsync.fns 2005-02-21 07:30:11
@@ -50,7 +50,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() {
echo "Running: \"$1\""
eval "$1"
status=$?
-@@ -166,6 +168,12 @@ checkit() {
- fi
-
+@@ -168,7 +170,6 @@ checkit() {
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
-+
-+ echo "-------------"
- echo "check how the files compare with diff:"
+ echo "check how the directory listings compare with diff:"
echo ""
- for f in `cd "$2"; find . -type f -print `
-@@ -173,12 +181,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 2005-01-19 20:11:10
-+++ 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
+
+--- orig/tls.c 2005-01-19 19:30:29
++++ tls.c 2005-03-23 17:49:48
@@ -39,6 +39,7 @@
+ 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 2005-01-20 23:05:34
-+++ util.c 2005-01-21 18:56:05
-@@ -128,12 +128,20 @@ void overflow(char *str)
+--- orig/util.c 2005-03-17 09:05:21
++++ util.c 2005-02-07 21:09:12
+@@ -128,12 +128,17 @@ void overflow(char *str)
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,
+ safe_fname(fname), (long)modtime,
- asctime(localtime(&modtime)));
+ mtimebuf,
-+ (long)atime, atimebuf);
++ (long)atime, timestring(atime));
}
if (dry_run)
-@@ -142,17 +150,17 @@ int set_modtime(char *fname, time_t modt
+@@ -142,17 +147,17 @@ int set_modtime(char *fname, time_t modt
{
#ifdef HAVE_UTIMBUF
struct utimbuf tbuf;
+ 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[0].tv_usec = 0;
t[1].tv_sec = modtime;
t[1].tv_usec = 0;
-@@ -1138,8 +1146,8 @@ int msleep(int t)
+@@ -1146,8 +1151,8 @@ int msleep(int t)
/**
* --modify-window).
*
* @retval 0 if the times should be treated as the same
-@@ -1148,7 +1156,7 @@ int msleep(int t)
+@@ -1156,7 +1161,7 @@ int msleep(int t)
*
* @retval -1 if the 2nd is later
**/
Matt McCutchen's Web Site / rsync / rsync-patches.git / blobdiff