--- batch.c 15 May 2004 19:31:10 -0000 1.32
-+++ batch.c 21 May 2004 08:47:28 -0000
++++ batch.c 6 Jun 2004 21:18:17 -0000
@@ -335,6 +335,8 @@ void show_flist(int index, struct file_s
rprintf(FINFO, "flist->flags=%#x\n", fptr[i]->flags);
rprintf(FINFO, "flist->modtime=%#lx\n",
rprintf(FINFO, "flist->length=%.0f\n",
(double) fptr[i]->length);
rprintf(FINFO, "flist->mode=%#o\n", (int) fptr[i]->mode);
---- flist.c 16 May 2004 23:54:12 -0000 1.224
-+++ flist.c 21 May 2004 08:47:28 -0000
+--- flist.c 29 May 2004 21:21:17 -0000 1.226
++++ flist.c 6 Jun 2004 21:18:17 -0000
@@ -57,6 +57,7 @@ extern int relative_paths;
extern int implied_dirs;
extern int copy_links;
}
-@@ -325,6 +326,7 @@ void send_file_entry(struct file_struct
+@@ -321,6 +322,7 @@ void send_file_entry(struct file_struct
{
unsigned short flags;
static time_t modtime;
static mode_t mode;
static uint64 dev;
static dev_t rdev;
-@@ -340,7 +342,7 @@ void send_file_entry(struct file_struct
+@@ -336,7 +338,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;
-@@ -389,6 +391,12 @@ void send_file_entry(struct file_struct
+@@ -385,6 +387,12 @@ void send_file_entry(struct file_struct
flags |= XMIT_SAME_TIME;
else
modtime = file->modtime;
#if SUPPORT_HARD_LINKS
if (file->link_u.idev) {
-@@ -444,6 +452,8 @@ void send_file_entry(struct file_struct
+@@ -440,6 +448,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);
-@@ -517,6 +527,7 @@ void receive_file_entry(struct file_stru
+@@ -513,6 +523,7 @@ void receive_file_entry(struct file_stru
struct file_list *flist, int f)
{
static time_t modtime;
static mode_t mode;
static uint64 dev;
static dev_t rdev;
-@@ -533,7 +544,7 @@ void receive_file_entry(struct file_stru
+@@ -529,7 +540,7 @@ void receive_file_entry(struct file_stru
struct file_struct *file;
if (!fptr) {
dev = 0, rdev = makedev(0, 0);
rdev_major = 0;
uid = 0, gid = 0;
-@@ -588,6 +599,8 @@ void receive_file_entry(struct file_stru
+@@ -584,6 +595,8 @@ void receive_file_entry(struct file_stru
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);
-@@ -638,6 +651,7 @@ void receive_file_entry(struct file_stru
+@@ -634,6 +647,7 @@ void receive_file_entry(struct file_stru
file->flags = flags & XMIT_TOP_DIR ? FLAG_TOP_DIR : 0;
file->modtime = modtime;
file->length = file_length;
file->mode = mode;
file->uid = uid;
-@@ -852,6 +866,7 @@ skip_excludes:
+@@ -848,6 +862,7 @@ skip_excludes:
file->flags = flags;
file->modtime = st.st_mtime;
file->length = st.st_size;
file->mode = st.st_mode;
file->uid = st.st_uid;
---- generator.c 18 May 2004 08:50:17 -0000 1.85
-+++ generator.c 21 May 2004 08:47:28 -0000
-@@ -100,7 +100,7 @@ static int skip_file(char *fname, struct
+--- generator.c 5 Jun 2004 16:16:30 -0000 1.86
++++ generator.c 6 Jun 2004 21:18:17 -0000
+@@ -101,7 +101,7 @@ static int skip_file(char *fname, struct
return 0;
}
}
-@@ -480,7 +480,7 @@ void recv_generator(char *fname, struct
+@@ -491,7 +491,7 @@ void recv_generator(char *fname, struct
return;
}
if (verbose > 1)
rprintf(FINFO,"%s is newer\n",fname);
return;
---- options.c 6 May 2004 21:08:01 -0000 1.148
-+++ options.c 21 May 2004 08:47:28 -0000
-@@ -46,6 +46,7 @@ int preserve_devices = 0;
+--- options.c 6 Jun 2004 19:02:40 -0000 1.155
++++ options.c 6 Jun 2004 21:18:18 -0000
+@@ -48,6 +48,7 @@ int preserve_devices = 0;
int preserve_uid = 0;
int preserve_gid = 0;
int preserve_times = 0;
int update_only = 0;
int cvs_exclude = 0;
int dry_run = 0;
-@@ -241,6 +242,7 @@ void usage(enum logcode F)
+@@ -245,6 +246,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," -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");
-@@ -346,6 +348,7 @@ static struct poptOption long_options[]
+@@ -352,6 +354,7 @@ static struct poptOption long_options[]
{"group", 'g', POPT_ARG_NONE, &preserve_gid, 0, 0, 0 },
{"devices", 'D', POPT_ARG_NONE, &preserve_devices, 0, 0, 0 },
{"times", 't', POPT_ARG_NONE, &preserve_times, 0, 0, 0 },
{"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 },
-@@ -823,6 +826,8 @@ void server_options(char **args,int *arg
+@@ -846,6 +849,8 @@ void server_options(char **args,int *arg
argstr[x++] = 'D';
if (preserve_times)
argstr[x++] = 't';
argstr[x++] = 'p';
if (recurse)
--- rsync.c 21 May 2004 08:43:03 -0000 1.140
-+++ rsync.c 21 May 2004 08:47:29 -0000
++++ rsync.c 6 Jun 2004 21:18:18 -0000
@@ -25,6 +25,7 @@
extern int verbose;
extern int dry_run;
change_uid = am_root && preserve_uid && st->st_uid != file->uid;
--- rsync.h 16 May 2004 07:28:24 -0000 1.204
-+++ rsync.h 21 May 2004 08:47:29 -0000
++++ rsync.h 6 Jun 2004 21:18:18 -0000
@@ -54,6 +54,7 @@
#define XMIT_HAS_IDEV_DATA (1<<9)
#define XMIT_SAME_DEV (1<<10)
uid_t uid;
gid_t gid;
mode_t mode;
---- rsync.yo 7 May 2004 00:18:37 -0000 1.169
-+++ rsync.yo 21 May 2004 08:47:29 -0000
-@@ -299,6 +299,7 @@ verb(
+--- rsync.yo 5 Jun 2004 16:16:30 -0000 1.171
++++ rsync.yo 6 Jun 2004 21:18:19 -0000
+@@ -300,6 +300,7 @@ verb(
-g, --group preserve group
-D, --devices preserve devices (root only)
-t, --times preserve 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
-@@ -546,6 +547,11 @@ cause the next transfer to behave as if
+@@ -552,6 +553,11 @@ cause the next transfer to behave as if
their checksums compared and show up in log messages even if they haven't
changed.
instead it will just report the actions it would have taken.
--- tls.c 15 May 2004 19:09:42 -0000 1.20
-+++ tls.c 21 May 2004 08:47:30 -0000
++++ tls.c 6 Jun 2004 21:18:19 -0000
@@ -39,6 +39,7 @@
return 0;
}
---- util.c 21 May 2004 08:40:25 -0000 1.144
-+++ util.c 21 May 2004 08:47:30 -0000
+--- util.c 5 Jun 2004 20:26:56 -0000 1.148
++++ util.c 6 Jun 2004 21:18:19 -0000
@@ -127,31 +127,39 @@ void overflow(char *str)
+ char mtimebuf[200];
+ char atimebuf[200];
+
-+ strlcpy(mtimebuf, timestring(modtime), sizeof(mtimebuf));
-+ strlcpy(atimebuf, timestring(atime), sizeof(atimebuf));
++ 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,
+ fname, (long)modtime,
- asctime(localtime(&modtime)));
+ mtimebuf,
-+ (long) atime, atimebuf);
++ (long)atime, atimebuf);
}
{
t[0].tv_usec = 0;
t[1].tv_sec = modtime;
t[1].tv_usec = 0;
-@@ -1058,8 +1066,8 @@ int msleep(int t)
+@@ -1065,8 +1073,8 @@ int msleep(int t)
/**
* --modify-window).
*
* @retval 0 if the times should be treated as the same
-@@ -1068,7 +1076,7 @@ int msleep(int t)
+@@ -1075,7 +1083,7 @@ int msleep(int t)
*
* @retval -1 if the 2nd is later
**/
if (file2 > file1) {
if (file2 - file1 <= modify_window)
--- /dev/null 1 Jan 1970 00:00:00 -0000
-+++ testsuite/copy-atimes.test 21 May 2004 08:47:30 -0000
++++ testsuite/copy-atimes.test 6 Jun 2004 21:18:19 -0000
@@ -0,0 +1,19 @@
+#! /bin/sh
+
+# The script would have aborted on error, so getting here means we've won.
+exit 0
--- testsuite/rsync.fns 18 May 2004 00:41:55 -0000 1.60
-+++ testsuite/rsync.fns 21 May 2004 08:47:30 -0000
++++ testsuite/rsync.fns 6 Jun 2004 21:18:19 -0000
@@ -50,7 +50,7 @@ printmsg() {