make proto
---- orig/batch.c 2004-07-24 16:52:09
+--- orig/batch.c 2005-04-09 18:00:28
+++ batch.c 2004-07-03 20:15:41
-@@ -186,6 +186,8 @@ void show_flist(int index, struct file_s
+@@ -208,6 +208,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 2004-07-17 15:20:05
-+++ flist.c 2004-07-03 20:15:41
-@@ -58,6 +58,7 @@ extern int relative_paths;
+--- orig/flist.c 2005-07-27 23:31:12
++++ 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;
-@@ -141,17 +142,17 @@ static void list_file_entry(struct file_
+ extern int orig_umask;
+@@ -141,16 +142,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)));
}
}
-
-@@ -332,6 +333,7 @@ void send_file_entry(struct file_struct
+@@ -314,6 +317,7 @@ void send_file_entry(struct file_struct
{
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
+@@ -329,7 +333,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;
-@@ -396,6 +398,12 @@ void send_file_entry(struct file_struct
+@@ -378,6 +382,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) {
-@@ -451,6 +459,8 @@ void send_file_entry(struct file_struct
+@@ -433,6 +443,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);
-@@ -524,6 +534,7 @@ void receive_file_entry(struct file_stru
- struct file_list *flist, int f)
+@@ -506,6 +518,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
+@@ -524,7 +537,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
+@@ -580,6 +593,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);
-@@ -645,6 +658,7 @@ void receive_file_entry(struct file_stru
+@@ -630,6 +645,7 @@ static struct file_struct *receive_file_
- file->flags = flags & XMIT_TOP_DIR ? FLAG_TOP_DIR : 0;
+ file->flags = 0;
file->modtime = modtime;
+ file->atime = atime;
file->length = file_length;
file->mode = mode;
file->uid = uid;
-@@ -864,6 +878,7 @@ skip_excludes:
+@@ -882,6 +898,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 2004-07-28 10:05:29
-+++ generator.c 2004-07-03 20:15:41
-@@ -98,7 +98,7 @@ static int skip_file(char *fname, struct
+--- orig/generator.c 2005-07-27 23:31:12
++++ generator.c 2004-11-03 23:02:12
+@@ -377,7 +377,7 @@ static int unchanged_file(char *fn, stru
if (ignore_times)
return 0;
}
-@@ -473,7 +473,7 @@ static void recv_generator(char *fname,
+@@ -851,7 +851,7 @@ static void recv_generator(char *fname,
}
- if (update_only && 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 2004-07-23 17:16:13
-+++ options.c 2004-07-03 20:15:41
-@@ -48,6 +48,7 @@ int preserve_devices = 0;
- int preserve_uid = 0;
+--- orig/options.c 2005-07-27 23:31:12
++++ options.c 2005-02-21 10:53:28
+@@ -49,6 +49,7 @@ int preserve_uid = 0;
int preserve_gid = 0;
int preserve_times = 0;
+ int omit_dir_times = 0;
+int copy_atimes = 0;
int update_only = 0;
int cvs_exclude = 0;
int dry_run = 0;
-@@ -252,6 +253,7 @@ void usage(enum logcode F)
+@@ -286,6 +287,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");
+ 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");
- rprintf(F," -W, --whole-file copy whole files, no incremental checks\n");
-@@ -360,6 +362,7 @@ static struct poptOption long_options[]
- {"group", 'g', POPT_ARG_NONE, &preserve_gid, 0, 0, 0 },
+@@ -413,6 +415,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_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 },
-@@ -881,6 +884,8 @@ void server_options(char **args,int *arg
+ {"verbose", 'v', POPT_ARG_NONE, 0, 'v', 0, 0 },
+ {"quiet", 'q', POPT_ARG_NONE, 0, 'q', 0, 0 },
+@@ -1292,6 +1295,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 == 2 && am_sender)
+ argstr[x++] = 'O';
if (preserve_perms)
- argstr[x++] = 'p';
- if (recurse)
---- orig/rsync.c 2004-07-26 16:06:53
-+++ rsync.c 2004-07-03 20:15:41
-@@ -25,6 +25,7 @@
- extern int verbose;
- extern int dry_run;
+--- orig/rsync.c 2005-07-27 23:31:12
++++ rsync.c 2005-07-27 23:35:49
+@@ -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;
-@@ -144,17 +145,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)))
+@@ -56,6 +57,7 @@ int set_perms(char *fname,struct file_st
+ int updated = 0;
+ STRUCT_STAT st2;
+ int change_uid, change_gid;
++ time_t atime, mtime;
+
+ if (!st) {
+ if (dry_run)
+@@ -68,18 +70,31 @@ int set_perms(char *fname,struct file_st
+ st = &st2;
+ }
+
++ if (!copy_atimes || S_ISDIR(st->st_mode))
++ flags |= PERMS_SKIP_ATIME;
+ if (!preserve_times || (S_ISDIR(st->st_mode) && omit_dir_times))
flags |= PERMS_SKIP_MTIME;
-- if (!(flags & PERMS_SKIP_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_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)) {
+- 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 (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-07-23 17:16:13
+--- orig/rsync.h 2005-05-03 17:11:01
+++ 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. */
-@@ -111,6 +112,7 @@
+@@ -118,6 +119,7 @@
#define PERMS_REPORT (1<<0)
#define PERMS_SKIP_MTIME (1<<1)
#define FULL_FLUSH 1
#define NORMAL_FLUSH 0
-@@ -422,6 +424,7 @@ struct file_struct {
+@@ -509,6 +511,7 @@ struct file_struct {
struct hlink *links;
} link_u;
time_t modtime;
uid_t uid;
gid_t gid;
mode_t mode;
---- orig/rsync.yo 2004-07-24 16:52:10
-+++ rsync.yo 2004-07-03 20:15:41
-@@ -301,6 +301,7 @@ verb(
- -g, --group preserve group
+--- orig/rsync.yo 2005-07-07 23:11:09
++++ rsync.yo 2005-01-24 01:57:18
+@@ -311,6 +311,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
-@@ -567,6 +568,11 @@ cause the next transfer to behave as if
- their checksums compared and show up in log messages even if they haven't
- changed.
+ -W, --whole-file copy files whole (without rsync algorithm)
+@@ -648,6 +649,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(-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.
++reading the source file may update the atime, so repeated rsync runs
++with --copy-atimes may be needed if you want the atime values to be
++100% identical.
+
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.
+
+# 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
+--- orig/testsuite/rsync.fns 2005-06-10 21:33:28
++++ 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() {
-@@ -150,6 +150,8 @@ checkit() {
+@@ -158,6 +158,8 @@ checkit() {
# We can just write everything to stdout/stderr, because the
# wrapper hides it unless there is a problem.
echo "Running: \"$1\""
eval "$1"
status=$?
-@@ -158,6 +160,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 `
-@@ -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
+
+--- orig/tls.c 2005-01-19 19:30:29
++++ tls.c 2005-03-23 17:49:48
@@ -39,6 +39,7 @@
+ 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);
+ 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-07-26 16:33:24
-+++ util.c 2004-07-03 20:15:41
-@@ -127,31 +127,39 @@ void overflow(char *str)
+--- orig/util.c 2005-07-27 23:31:12
++++ util.c 2005-07-27 23:37:27
+@@ -128,7 +128,7 @@ void overflow_exit(char *str)
--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))
+@@ -136,9 +136,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,
+ safe_fname(fname), (long)modtime,
- asctime(localtime(&modtime)));
-+ mtimebuf,
-+ (long)atime, atimebuf);
++ mtimebuf, (long)atime, timestring(atime));
}
+ if (dry_run)
+@@ -147,7 +151,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;
+@@ -158,12 +162,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;
-@@ -1103,8 +1111,8 @@ int msleep(int t)
+@@ -1167,8 +1171,8 @@ int msleep(int t)
/**
* --modify-window).
*
* @retval 0 if the times should be treated as the same
-@@ -1113,7 +1121,7 @@ int msleep(int t)
+@@ -1177,7 +1181,7 @@ int msleep(int t)
*
* @retval -1 if the 2nd is later
**/