make proto
---- orig/batch.c 2005-03-16 02:19:29.133830510
+--- orig/batch.c 2005-04-09 18:00:28
+++ batch.c 2004-07-03 20:15:41
-@@ -197,6 +197,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 2005-03-16 02:19:29.897764030
+--- 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 protocol_version;
extern int sanitize_paths;
extern int orig_umask;
-@@ -140,16 +141,18 @@ static void list_file_entry(struct file_
+@@ -141,16 +142,18 @@ static void list_file_entry(struct file_
#ifdef SUPPORT_LINKS
if (preserve_links && S_ISLNK(f->mode)) {
safe_fname(f_name(f)));
}
}
-@@ -313,6 +316,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 mode_t mode;
static int64 dev;
static dev_t rdev;
-@@ -328,7 +332,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;
-@@ -377,6 +381,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;
#ifdef SUPPORT_HARD_LINKS
if (file->link_u.idev) {
-@@ -432,6 +442,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);
-@@ -505,6 +517,7 @@ static struct file_struct *receive_file_
+@@ -506,6 +518,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;
-@@ -523,7 +536,7 @@ static struct file_struct *receive_file_
+@@ -524,7 +537,7 @@ static struct file_struct *receive_file_
struct file_struct *file;
if (!flist) {
dev = 0, rdev = makedev(0, 0);
rdev_major = 0;
uid = 0, gid = 0;
-@@ -579,6 +592,8 @@ static struct file_struct *receive_file_
+@@ -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);
-@@ -629,6 +644,7 @@ static struct file_struct *receive_file_
+@@ -630,6 +645,7 @@ static struct file_struct *receive_file_
file->flags = 0;
file->modtime = modtime;
file->length = file_length;
file->mode = mode;
file->uid = uid;
-@@ -878,6 +894,7 @@ skip_filters:
+@@ -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 2005-03-16 02:19:29.980756807
+--- orig/generator.c 2005-07-27 23:31:12
+++ generator.c 2004-11-03 23:02:12
-@@ -373,7 +373,7 @@ static int unchanged_file(char *fn, stru
+@@ -377,7 +377,7 @@ static int unchanged_file(char *fn, stru
if (ignore_times)
return 0;
}
-@@ -838,7 +838,7 @@ static void recv_generator(char *fname,
+@@ -851,7 +851,7 @@ static void recv_generator(char *fname,
}
if (update_only && statret == 0
if (verbose > 1)
rprintf(FINFO, "%s is newer\n", safe_fname(fname));
return;
---- orig/options.c 2005-03-16 02:19:30.152741841
+--- orig/options.c 2005-07-27 23:31:12
+++ options.c 2005-02-21 10:53:28
-@@ -50,6 +50,7 @@ int preserve_uid = 0;
+@@ -49,6 +49,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;
-@@ -285,6 +286,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," -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");
-@@ -409,6 +411,7 @@ static struct poptOption long_options[]
+@@ -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 },
{"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 },
-@@ -1277,6 +1280,8 @@ void server_options(char **args,int *arg
+@@ -1292,6 +1295,8 @@ void server_options(char **args,int *arg
argstr[x++] = 'D';
if (preserve_times)
argstr[x++] = 't';
if (omit_dir_times == 2 && am_sender)
argstr[x++] = 'O';
if (preserve_perms)
---- orig/rsync.c 2005-03-16 02:19:30.453715649
-+++ rsync.c 2005-02-21 10:57:03
+--- 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;
if (!st) {
if (dry_run)
-@@ -68,17 +70,27 @@ int set_perms(char *fname,struct file_st
+@@ -68,18 +70,31 @@ int set_perms(char *fname,struct file_st
st = &st2;
}
-+ if (!copy_atimes || S_ISLNK(st->st_mode) || S_ISDIR(st->st_mode))
++ if (!copy_atimes || 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))
+ if (!preserve_times || (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) {
+ atime = st->st_atime;
if (!(flags & PERMS_SKIP_MTIME)
- && cmp_modtime(st->st_mtime, file->modtime) != 0) {
-- if (set_modtime(fname,file->modtime) != 0) {
-- rsyserr(FERROR, errno, "failed to set times on %s",
-- full_fname(fname));
-- return 0;
-- }
+- int ret = set_modtime(fname, file->modtime, st->st_mode);
+ && cmp_time(st->st_mtime, file->modtime) != 0) {
+ mtime = file->modtime;
- updated = 1;
++ updated = 1;
+ } else
+ mtime = st->st_mtime;
-+ if (updated && set_times(fname, mtime, atime) != 0) {
-+ rsyserr(FERROR, errno, "failed to set times on %s",
-+ full_fname(fname));
-+ return 0;
++ 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;
+ }
+- 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 2005-03-16 02:19:30.524709471
+--- 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)
#define FULL_FLUSH 1
#define NORMAL_FLUSH 0
-@@ -510,6 +512,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 2005-03-16 02:19:30.727691806
+--- orig/rsync.yo 2005-07-07 23:11:09
+++ rsync.yo 2005-01-24 01:57:18
-@@ -321,6 +321,7 @@ to the detailed description below for a
+@@ -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
-S, --sparse handle sparse files efficiently
-n, --dry-run show what would have been transferred
-W, --whole-file copy files whole (without rsync algorithm)
-@@ -654,6 +655,11 @@ it is preserving modification times (see
+@@ -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 2005-02-21 07:26:59
+--- orig/testsuite/rsync.fns 2005-06-10 21:33:28
+++ testsuite/rsync.fns 2005-02-21 07:30:11
@@ -50,7 +50,7 @@ printmsg() {
diff $diffopt "$tmpdir/ls-from" "$tmpdir/ls-to" || failed=YES
--- orig/tls.c 2005-01-19 19:30:29
-+++ tls.c 2004-07-03 20:15:41
++++ 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-03-11 17:36:35
-+++ util.c 2005-02-07 21:09:12
-@@ -128,12 +128,17 @@ 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 !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];
+ "set modtime, atime of %s to (%ld) %s, (%ld) %s\n",
safe_fname(fname), (long)modtime,
- asctime(localtime(&modtime)));
-+ mtimebuf,
-+ (long)atime, timestring(atime));
++ mtimebuf, (long)atime, timestring(atime));
}
if (dry_run)
-@@ -142,17 +147,17 @@ int set_modtime(char *fname, time_t modt
+@@ -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;
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;
-@@ -1146,8 +1151,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
-@@ -1156,7 +1161,7 @@ int msleep(int t)
+@@ -1177,7 +1181,7 @@ int msleep(int t)
*
* @retval -1 if the 2nd is later
**/
Matt McCutchen's Web Site / rsync / rsync-patches.git / blobdiff