rprintf(FINFO, "flist->length=%.0f\n",
(double) fptr[i]->length);
rprintf(FINFO, "flist->mode=%#o\n", (int) fptr[i]->mode);
---- orig/flist.c 2004-08-11 23:42:23
+--- orig/flist.c 2005-01-21 00:35:26
+++ flist.c 2004-07-03 20:15:41
-@@ -58,6 +58,7 @@ extern int relative_paths;
+@@ -59,6 +59,7 @@ extern int relative_paths;
extern int implied_dirs;
extern int copy_links;
extern int copy_unsafe_links;
extern int protocol_version;
extern int sanitize_paths;
extern int delete_excluded;
-@@ -141,17 +142,17 @@ static void list_file_entry(struct file_
+@@ -143,17 +144,17 @@ static void list_file_entry(struct file_
#if SUPPORT_LINKS
if (preserve_links && S_ISLNK(f->mode)) {
}
}
-@@ -332,6 +333,7 @@ void send_file_entry(struct file_struct
+@@ -334,6 +335,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
+@@ -349,7 +351,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
+@@ -398,6 +400,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) {
-@@ -451,6 +459,8 @@ void send_file_entry(struct file_struct
+@@ -453,6 +461,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
+@@ -526,6 +536,7 @@ void receive_file_entry(struct file_stru
struct file_list *flist, 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
+@@ -542,7 +553,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;
-@@ -595,6 +606,8 @@ void receive_file_entry(struct file_stru
+@@ -597,6 +608,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);
-@@ -645,6 +658,7 @@ void receive_file_entry(struct file_stru
+@@ -647,6 +660,7 @@ void receive_file_entry(struct file_stru
- file->flags = flags & XMIT_TOP_DIR ? FLAG_TOP_DIR : 0;
+ file->flags = flags & XMIT_DEL_START ? FLAG_DEL_START : 0;
file->modtime = modtime;
+ file->atime = atime;
file->length = file_length;
file->mode = mode;
file->uid = uid;
-@@ -866,6 +880,7 @@ skip_excludes:
+@@ -873,6 +887,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;
---- orig/generator.c 2004-08-05 18:24:21
-+++ generator.c 2004-07-03 20:15:41
-@@ -90,7 +90,7 @@ static int skip_file(char *fname, struct
+--- orig/generator.c 2005-01-20 23:05:34
++++ generator.c 2004-11-03 23:02:12
+@@ -96,7 +96,7 @@ static int unchanged_file(char *fn, stru
if (ignore_times)
return 0;
}
-@@ -470,7 +470,7 @@ static void recv_generator(char *fname,
+@@ -492,7 +492,7 @@ static void recv_generator(char *fname,
}
- if (update_only && fnamecmp == fname
+ if (update_only && fnamecmp_type == FNAMECMP_FNAME
- && 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-08-11 23:42:23
+--- orig/options.c 2005-01-20 23:05:34
+++ options.c 2004-07-03 20:15:41
@@ -48,6 +48,7 @@ int preserve_devices = 0;
int preserve_uid = 0;
int update_only = 0;
int cvs_exclude = 0;
int dry_run = 0;
-@@ -253,6 +254,7 @@ void usage(enum logcode F)
+@@ -261,6 +262,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");
-@@ -362,6 +364,7 @@ static struct poptOption long_options[]
+@@ -367,6 +369,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 },
+ {"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 },
-@@ -940,6 +943,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 },
+@@ -1080,6 +1083,8 @@ void server_options(char **args,int *arg
argstr[x++] = 'D';
if (preserve_times)
argstr[x++] = 't';
if (preserve_perms)
argstr[x++] = 'p';
if (recurse)
---- orig/rsync.c 2004-08-09 21:07:10
-+++ rsync.c 2004-07-03 20:15:41
+--- orig/rsync.c 2005-01-20 23:52:09
++++ rsync.c 2004-08-13 08:17:28
@@ -25,6 +25,7 @@
extern int verbose;
extern int dry_run;
extern int am_root;
extern int am_sender;
extern int am_generator;
-@@ -145,17 +146,31 @@ int set_perms(char *fname,struct file_st
+@@ -167,17 +168,32 @@ 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)))
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))) {
++ if ((flags & (PERMS_SKIP_MTIME|PERMS_SKIP_ATIME))
++ != (PERMS_SKIP_MTIME|PERMS_SKIP_ATIME)) {
+ time_t atime, mtime;
+
+ if (!(flags & PERMS_SKIP_ATIME)
}
change_uid = am_root && preserve_uid && st->st_uid != file->uid;
---- orig/rsync.h 2004-08-03 15:41:32
+--- orig/rsync.h 2005-01-21 00:35:26
+++ 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 @@
+@@ -115,6 +116,7 @@
#define PERMS_REPORT (1<<0)
#define PERMS_SKIP_MTIME (1<<1)
#define FULL_FLUSH 1
#define NORMAL_FLUSH 0
-@@ -425,6 +427,7 @@ struct file_struct {
+@@ -433,6 +435,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-08-11 17:26:27
+--- orig/rsync.yo 2005-01-20 19:47:08
+++ rsync.yo 2004-07-03 20:15:41
-@@ -301,6 +301,7 @@ verb(
+@@ -330,6 +330,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
-@@ -574,6 +575,11 @@ cause the next transfer to behave as if
+@@ -630,6 +631,11 @@ cause the next transfer to behave as if
updated (though the rsync algorithm will make the update fairly efficient
if the files haven't actually changed, you're much better off using -t).
+
+# 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
+--- orig/testsuite/rsync.fns 2004-09-18 01:49:34
+++ testsuite/rsync.fns 2004-07-03 20:15:41
@@ -50,7 +50,7 @@ printmsg() {
}
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() {
+@@ -166,6 +168,12 @@ checkit() {
fi
echo "-------------"
echo "check how the files compare with diff:"
echo ""
for f in `cd "$2"; find . -type f -print `
-@@ -165,12 +173,6 @@ checkit() {
+@@ -173,12 +181,6 @@ checkit() {
diff $diffopt "$2"/"$f" "$3"/"$f" || failed=YES
done
if [ -z "$failed" ] ; then
return 0
else
---- orig/tls.c 2004-05-15 20:10:13
+--- orig/tls.c 2005-01-19 20:11:10
+++ tls.c 2004-07-03 20:15:41
@@ -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);
return 0;
}
---- orig/util.c 2004-08-11 23:42:23
-+++ util.c 2004-07-03 20:15:41
-@@ -128,31 +128,39 @@ void overflow(char *str)
+--- 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)
-int set_modtime(char *fname, time_t modtime)
+int set_times(char *fname, time_t modtime, time_t atime)
{
- if (dry_run)
- return 0;
-
if (verbose > 2) {
- rprintf(FINFO, "set modtime of %s to (%ld) %s",
+ char mtimebuf[200];
+ (long)atime, atimebuf);
}
+ if (dry_run)
+@@ -142,17 +150,17 @@ int set_modtime(char *fname, time_t modt
{
#ifdef HAVE_UTIMBUF
struct utimbuf tbuf;
t[0].tv_usec = 0;
t[1].tv_sec = modtime;
t[1].tv_usec = 0;
-@@ -1156,8 +1164,8 @@ int msleep(int t)
+@@ -1138,8 +1146,8 @@ int msleep(int t)
/**
* --modify-window).
*
* @retval 0 if the times should be treated as the same
-@@ -1166,7 +1174,7 @@ int msleep(int t)
+@@ -1148,7 +1156,7 @@ int msleep(int t)
*
* @retval -1 if the 2nd is later
**/
Matt McCutchen's Web Site / rsync / rsync-patches.git / blobdiff