make proto
---- orig/batch.c 2005-04-09 18:00:28
+--- orig/batch.c 2005-10-26 16:49:08
+++ batch.c 2004-07-03 20:15:41
-@@ -208,6 +208,8 @@ void show_flist(int index, struct file_s
+@@ -225,6 +225,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-08-17 06:45:07
+--- orig/flist.c 2005-11-10 16:58:36
+++ flist.c 2005-07-28 00:16:34
@@ -50,6 +50,7 @@ extern int preserve_perms;
extern int preserve_devices;
extern int relative_paths;
extern int implied_dirs;
extern int copy_links;
-@@ -141,16 +142,18 @@ static void list_file_entry(struct file_
+@@ -140,16 +141,18 @@ static void list_file_entry(struct file_
#ifdef SUPPORT_LINKS
if (preserve_links && S_ISLNK(f->mode)) {
safe_fname(f_name(f)));
}
}
-@@ -314,6 +317,7 @@ void send_file_entry(struct file_struct
+@@ -311,6 +314,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;
-@@ -329,7 +333,7 @@ void send_file_entry(struct file_struct
+@@ -326,7 +330,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;
-@@ -378,6 +382,12 @@ void send_file_entry(struct file_struct
+@@ -375,6 +379,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) {
-@@ -433,6 +443,8 @@ void send_file_entry(struct file_struct
+@@ -428,6 +438,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);
-@@ -506,6 +518,7 @@ static struct file_struct *receive_file_
+@@ -495,6 +507,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;
-@@ -524,7 +537,7 @@ static struct file_struct *receive_file_
+@@ -513,7 +526,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;
-@@ -580,6 +593,8 @@ static struct file_struct *receive_file_
+@@ -569,6 +582,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);
-@@ -630,6 +645,7 @@ static struct file_struct *receive_file_
+@@ -619,6 +634,7 @@ static struct file_struct *receive_file_
file->flags = 0;
file->modtime = modtime;
file->length = file_length;
file->mode = mode;
file->uid = uid;
-@@ -882,6 +898,7 @@ skip_filters:
+@@ -867,6 +883,7 @@ struct file_struct *make_file(char *fnam
file->flags = flags;
file->modtime = st.st_mtime;
+ file->atime = st.st_atime;
file->length = st.st_size;
- file->mode = st.st_mode;
- file->uid = st.st_uid;
---- orig/generator.c 2005-08-17 06:45:07
-+++ generator.c 2005-07-28 00:14:43
+ if (chmod_modes && am_sender && (S_ISREG(st.st_mode) || S_ISDIR(st.st_mode)))
+ file->mode = tweak_mode(st.st_mode, chmod_modes);
+--- orig/generator.c 2005-12-15 23:00:49
++++ generator.c 2005-12-15 23:05:32
@@ -44,6 +44,7 @@ extern int preserve_uid;
extern int preserve_gid;
extern int preserve_times;
extern int delete_before;
extern int delete_during;
extern int delete_after;
-@@ -324,9 +325,21 @@ void itemize(struct file_struct *file, i
- : S_ISDIR(file->mode) ? !omit_dir_times
- : !S_ISLNK(file->mode);
-
-+ if (iflags & (ITEM_TRANSFER|ITEM_LOCAL_CHANGE) && !keep_time
-+ && (!(iflags & ITEM_XNAME_FOLLOWS) || *xname)) {
+@@ -343,10 +344,18 @@ void itemize(struct file_struct *file, i
+
+ if (S_ISREG(file->mode) && file->length != st->st_size)
+ iflags |= ITEM_REPORT_SIZE;
+- if ((iflags & (ITEM_TRANSFER|ITEM_LOCAL_CHANGE) && !keep_time
+- && (!(iflags & ITEM_XNAME_FOLLOWS) || *xname))
+- || (keep_time && cmp_modtime(file->modtime, st->st_mtime) != 0))
++ if (iflags & (ITEM_TRANSFER|ITEM_LOCAL_CHANGE) && !keep_time
++ && (!(iflags & ITEM_XNAME_FOLLOWS) || *xname)) {
+ iflags |= ITEM_REPORT_TIME;
++ if (!preserve_atimes && !S_ISDIR(file->mode))
++ iflags |= ITEM_REPORT_ATIME;
++ } else {
++ if (keep_time && cmp_time(file->modtime, st->st_mtime) != 0)
+ iflags |= ITEM_REPORT_TIME;
-+ if (!preserve_atimes && !S_ISDIR(file->mode))
-+ iflags |= ITEM_REPORT_ATIME;
-+ } else {
-+ if (keep_time && cmp_time(file->modtime, st->st_mtime) != 0)
-+ iflags |= ITEM_REPORT_TIME;
-+ if (preserve_atimes && !S_ISDIR(file->mode)
-+ && cmp_time(file->atime, st->st_atime) != 0)
-+ iflags |= ITEM_REPORT_ATIME;
-+ }
- if ((iflags & (ITEM_TRANSFER|ITEM_LOCAL_CHANGE) && !keep_time
- && (!(iflags & ITEM_XNAME_FOLLOWS) || *xname))
-- || (keep_time && cmp_modtime(file->modtime, st->st_mtime) != 0))
-+ || (keep_time && cmp_time(file->modtime, st->st_mtime) != 0))
- iflags |= ITEM_REPORT_TIME;
- if (preserve_perms
- && (file->mode & CHMOD_BITS) != (st->st_mode & CHMOD_BITS))
-@@ -378,7 +391,7 @@ static int unchanged_file(char *fn, stru
++ if (preserve_atimes && !S_ISDIR(file->mode)
++ && cmp_time(file->atime, st->st_atime) != 0)
++ iflags |= ITEM_REPORT_ATIME;
++ }
+ if (preserve_perms
+ && (file->mode & CHMOD_BITS) != (st->st_mode & CHMOD_BITS))
+ iflags |= ITEM_REPORT_PERMS;
+@@ -395,7 +404,7 @@ int unchanged_file(char *fn, struct file
if (ignore_times)
return 0;
}
-@@ -538,7 +551,7 @@ static int find_fuzzy(struct file_struct
+@@ -555,7 +564,7 @@ static int find_fuzzy(struct file_struct
name = fp->basename;
if (fp->length == file->length
if (verbose > 4) {
rprintf(FINFO,
"fuzzy size/modtime match for %s\n",
-@@ -881,7 +894,7 @@ static void recv_generator(char *fname,
+@@ -1086,7 +1095,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/log.c 2005-06-10 21:33:28
-+++ log.c 2005-07-28 00:22:30
+--- orig/log.c 2005-12-15 23:00:49
++++ log.c 2005-12-15 23:05:44
@@ -38,6 +38,7 @@ extern int module_id;
extern int msg_fd_out;
extern int protocol_version;
extern int preserve_times;
+extern int preserve_atimes;
+ extern int log_format_has_i;
extern int log_format_has_o_or_i;
extern int daemon_log_format_has_o_or_i;
- extern char *auth_user;
-@@ -501,11 +502,14 @@ static void log_formatted(enum logcode c
+@@ -504,11 +505,14 @@ static void log_formatted(enum logcode c
n[4] = !(iflags & ITEM_REPORT_TIME) ? '.'
: !preserve_times || IS_DEVICE(file->mode)
|| S_ISLNK(file->mode) ? 'T' : 't';
if (iflags & (ITEM_IS_NEW|ITEM_MISSING_DATA)) {
char ch = iflags & ITEM_IS_NEW ? '+' : '?';
---- orig/options.c 2005-08-27 21:11:26
-+++ options.c 2005-08-27 21:16:51
-@@ -49,6 +49,7 @@ int preserve_uid = 0;
+--- orig/options.c 2005-11-15 18:21:22
++++ options.c 2005-11-07 04:32:19
+@@ -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;
-@@ -287,8 +288,9 @@ void usage(enum logcode F)
+@@ -293,8 +294,9 @@ void usage(enum logcode F)
rprintf(F," -o, --owner preserve owner (root only)\n");
rprintf(F," -g, --group preserve group\n");
rprintf(F," -D, --devices preserve devices (root only)\n");
+ rprintf(F," -t, --times preserve modify times\n");
+ rprintf(F," -O, --omit-dir-times omit directories when preserving modify times\n");
+ rprintf(F," -A, --atimes preserve access times\n");
+ rprintf(F," --chmod=CHMOD change destination permissions\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 files whole (without rsync algorithm)\n");
-@@ -388,6 +390,9 @@ static struct poptOption long_options[]
+@@ -402,6 +404,9 @@ static struct poptOption long_options[]
{"times", 't', POPT_ARG_VAL, &preserve_times, 1, 0, 0 },
{"no-times", 0, POPT_ARG_VAL, &preserve_times, 0, 0, 0 },
{"no-t", 0, POPT_ARG_VAL, &preserve_times, 0, 0, 0 },
{"omit-dir-times", 'O', POPT_ARG_VAL, &omit_dir_times, 2, 0, 0 },
{"modify-window", 0, POPT_ARG_INT, &modify_window, OPT_MODIFY_WINDOW, 0, 0 },
{"owner", 'o', POPT_ARG_VAL, &preserve_uid, 1, 0, 0 },
-@@ -1337,6 +1342,8 @@ void server_options(char **args,int *arg
+@@ -1440,6 +1445,8 @@ void server_options(char **args,int *arg
argstr[x++] = 'D';
if (preserve_times)
argstr[x++] = 't';
}
change_uid = am_root && preserve_uid && st->st_uid != file->uid;
---- orig/rsync.h 2005-08-17 06:45:08
+--- orig/rsync.h 2005-12-15 23:00:49
+++ rsync.h 2005-07-28 00:04:51
@@ -54,6 +54,7 @@
#define XMIT_HAS_IDEV_DATA (1<<9)
/* These flags are used in the live flist data. */
-@@ -118,6 +119,7 @@
+@@ -119,6 +120,7 @@
#define PERMS_REPORT (1<<0)
#define PERMS_SKIP_MTIME (1<<1)
#define FULL_FLUSH 1
#define NORMAL_FLUSH 0
-@@ -139,6 +141,7 @@
- #define DEL_TERSE (1<<3)
+@@ -135,6 +137,7 @@
+ #define FNAMECMP_FUZZY 0x83
/* For use by the itemize_changes code */
+#define ITEM_REPORT_ATIME (1<<0)
#define ITEM_REPORT_CHECKSUM (1<<1)
#define ITEM_REPORT_SIZE (1<<2)
#define ITEM_REPORT_TIME (1<<3)
-@@ -517,6 +520,7 @@ struct file_struct {
+@@ -516,6 +519,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-08-27 21:05:12
-+++ rsync.yo 2005-07-28 01:04:09
-@@ -321,8 +321,9 @@ to the detailed description below for a
+--- orig/rsync.yo 2005-12-15 07:55:39
++++ rsync.yo 2005-11-07 04:34:55
+@@ -319,8 +319,9 @@ to the detailed description below for a
-o, --owner preserve owner (root only)
-g, --group preserve group
-D, --devices preserve devices (root only)
- -t, --times preserve times
+- -O, --omit-dir-times omit directories when preserving times
+ -t, --times preserve modify times
- -O, --omit-dir-times omit directories when preserving times
++ -O, --omit-dir-times omit directories when preserving mod-times
+ -A, --atimes preserve access times
+ --chmod=CHMOD change destination permissions
-S, --sparse handle sparse files efficiently
-n, --dry-run show what would have been transferred
- -W, --whole-file copy files whole (without rsync algorithm)
-@@ -695,6 +696,12 @@ it is preserving modification times (see
+@@ -702,6 +703,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).
+repeated rsync runs with --atimes may be needed if you want to force the
+access-time values to be 100% identical on the two systems.
+
- 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.
-
-@@ -1103,7 +1110,7 @@ changes that are being made to each file
+ dit(bf(--chmod)) This options tells rsync to apply the listed "chmod" pattern
+ to the permission of the files on the destination. In addition to the normal
+ parsing rules specified in the chmod manpage, you can specify an item that
+@@ -1153,7 +1160,7 @@ changes that are being made to each file
This is exactly the same as specifying bf(--log-format='%i %n%L').
The "%i" escape has a cryptic output that is 9 letters long. The general
kind of update being done, bf(X) is replaced by the file-type, and the
other letters represent attributes that may be output if they are being
modified.
-@@ -1142,17 +1149,22 @@ quote(itemize(
+@@ -1192,17 +1199,22 @@ quote(itemize(
by the file transfer.
it() A bf(t) means the modification time is different and is being updated
to the sender's value (requires bf(--times)). An alternate value of bf(T)
+
+# The script would have aborted on error, so getting here means we've won.
+exit 0
---- orig/testsuite/itemize.test 2005-07-07 20:35:48
-+++ testsuite/itemize.test 2005-07-28 00:29:54
+--- orig/testsuite/itemize.test 2005-12-15 23:00:49
++++ testsuite/itemize.test 2005-12-15 23:11:34
@@ -44,14 +44,14 @@ ln "$fromdir/foo/config1" "$fromdir/foo/
$RSYNC -iplr "$fromdir/" "$todir/" \
| tee "$outfile"
-.d..t.... ./
-cd+++++++ bar/
-cd+++++++ bar/baz/
--cf....... bar/baz/rsync
+-cf bar/baz/rsync
-cd+++++++ foo/
--cf....... foo/config1
--cf....... foo/config2
--hf+++++++ foo/extra => foo/config1
--cL+++++++ foo/sym -> ../bar/baz/rsync
+-cf foo/config1
+-cf foo/config2
+-hf foo/extra => foo/config1
+-cL..T.... foo/sym -> ../bar/baz/rsync
+.d..t..... ./
+cd++++++++ bar/
+cd++++++++ bar/baz/
-+cf........ bar/baz/rsync
++cf bar/baz/rsync
+cd++++++++ foo/
-+cf........ foo/config1
-+cf........ foo/config2
-+hf++++++++ foo/extra => foo/config1
-+cL++++++++ foo/sym -> ../bar/baz/rsync
++cf foo/config1
++cf foo/config2
++hf foo/extra => foo/config1
++cL..T..... foo/sym -> ../bar/baz/rsync
EOT
diff $diffopt "$chkfile" "$outfile" || test_fail "test 8 failed"
-@@ -165,12 +165,12 @@ rm -rf "$todir"
- $RSYNC -iplrtH --link-dest="$lddir" "$fromdir/" "$todir/" \
+@@ -165,11 +165,11 @@ rm -rf "$todir"
+ $RSYNC -iplrtH --copy-dest="$lddir" "$fromdir/" "$todir/" \
| tee "$outfile"
cat <<EOT >"$chkfile"
-.d..t.... ./
-cd+++++++ bar/
-cd+++++++ bar/baz/
-cd+++++++ foo/
--hf+++++++ foo/extra => foo/config1
--cL+++++++ foo/sym -> ../bar/baz/rsync
+-hf foo/extra => foo/config1
+.d..t..... ./
+cd++++++++ bar/
+cd++++++++ bar/baz/
+cd++++++++ foo/
-+hf++++++++ foo/extra => foo/config1
-+cL++++++++ foo/sym -> ../bar/baz/rsync
++hf foo/extra => foo/config1
EOT
diff $diffopt "$chkfile" "$outfile" || test_fail "test 9 failed"
+@@ -196,15 +196,15 @@ $RSYNC -ivvplrtH --link-dest="$lddir" "$
+ | tee "$outfile"
+ filter_outfile
+ cat <<EOT >"$chkfile"
+-.d..t.... ./
+-cd+++++++ bar/
+-cd+++++++ bar/baz/
+-hf bar/baz/rsync
+-cd+++++++ foo/
+-hf foo/config1
+-hf foo/config2
+-hf foo/extra => foo/config1
+-hL foo/sym -> ../bar/baz/rsync
++.d..t..... ./
++cd++++++++ bar/
++cd++++++++ bar/baz/
++hf bar/baz/rsync
++cd++++++++ foo/
++hf foo/config1
++hf foo/config2
++hf foo/extra => foo/config1
++hL foo/sym -> ../bar/baz/rsync
+ EOT
+ diff $diffopt "$chkfile" "$outfile" || test_fail "test 11 failed"
+
+@@ -212,10 +212,10 @@ rm -rf "$todir"
+ $RSYNC -iplrtH --link-dest="$lddir" "$fromdir/" "$todir/" \
+ | tee "$outfile"
+ cat <<EOT >"$chkfile"
+-.d..t.... ./
+-cd+++++++ bar/
+-cd+++++++ bar/baz/
+-cd+++++++ foo/
++.d..t..... ./
++cd++++++++ bar/
++cd++++++++ bar/baz/
++cd++++++++ foo/
+ EOT
+ diff $diffopt "$chkfile" "$outfile" || test_fail "test 12 failed"
+
+@@ -243,14 +243,14 @@ filter_outfile
+ # TODO fix really-old problem when combining -H with --compare-dest:
+ # missing output for foo/extra hard-link (and it might not be updated)!
+ cat <<EOT >"$chkfile"
+-.d..t.... ./
+-cd+++++++ bar/
+-cd+++++++ bar/baz/
+-.f bar/baz/rsync
+-cd+++++++ foo/
+-.f foo/config1
+-.f foo/config2
+-.L foo/sym -> ../bar/baz/rsync
++.d..t..... ./
++cd++++++++ bar/
++cd++++++++ bar/baz/
++.f bar/baz/rsync
++cd++++++++ foo/
++.f foo/config1
++.f foo/config2
++.L foo/sym -> ../bar/baz/rsync
+ EOT
+ diff $diffopt "$chkfile" "$outfile" || test_fail "test 14 failed"
+
+@@ -258,10 +258,10 @@ rm -rf "$todir"
+ $RSYNC -iplrtH --compare-dest="$lddir" "$fromdir/" "$todir/" \
+ | tee "$outfile"
+ cat <<EOT >"$chkfile"
+-.d..t.... ./
+-cd+++++++ bar/
+-cd+++++++ bar/baz/
+-cd+++++++ foo/
++.d..t..... ./
++cd++++++++ bar/
++cd++++++++ bar/baz/
++cd++++++++ foo/
+ EOT
+ diff $diffopt "$chkfile" "$outfile" || test_fail "test 15 failed"
+
--- orig/testsuite/rsync.fns 2005-06-10 21:33:28
+++ testsuite/rsync.fns 2005-07-28 00:41:20
@@ -50,7 +50,7 @@ printmsg() {
( 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
+--- orig/tls.c 2005-09-24 17:40:31
+++ tls.c 2005-03-23 17:49:48
@@ -39,6 +39,7 @@
+ struct tm *mt = gmtime(&t);
+ sprintf(dest, "%04d-%02d-%02d %02d:%02d:%02d ",
-+ mt->tm_year + 1900,
-+ mt->tm_mon + 1,
-+ mt->tm_mday,
-+ mt->tm_hour,
-+ mt->tm_min,
-+ mt->tm_sec);
++ (int)mt->tm_year + 1900,
++ (int)mt->tm_mon + 1,
++ (int)mt->tm_mday,
++ (int)mt->tm_hour,
++ (int)mt->tm_min,
++ (int)mt->tm_sec);
+ } else {
+ strcpy(dest, " ");
+ }
- mt = gmtime(&buf.st_mtime);
-
- sprintf(datebuf, "%04d-%02d-%02d %02d:%02d:%02d",
-- mt->tm_year + 1900,
-- mt->tm_mon + 1,
-- mt->tm_mday,
-- mt->tm_hour,
-- mt->tm_min,
-- mt->tm_sec);
+- (int)mt->tm_year + 1900,
+- (int)mt->tm_mon + 1,
+- (int)mt->tm_mday,
+- (int)mt->tm_hour,
+- (int)mt->tm_min,
+- (int)mt->tm_sec);
- } else {
- strcpy(datebuf, " ");
- }
return 0;
}
---- orig/util.c 2005-08-17 06:45:08
+--- orig/util.c 2005-11-12 20:13:05
+++ util.c 2005-07-27 23:37:27
-@@ -128,7 +128,7 @@ void overflow_exit(char *str)
+@@ -130,7 +130,7 @@ void overflow_exit(char *str)
{
#if !defined HAVE_LUTIMES || !defined HAVE_UTIMES
if (S_ISLNK(mode))
-@@ -136,9 +136,13 @@ int set_modtime(char *fname, time_t modt
+@@ -138,9 +138,13 @@ int set_modtime(char *fname, time_t modt
#endif
if (verbose > 2) {
}
if (dry_run)
-@@ -147,7 +151,7 @@ int set_modtime(char *fname, time_t modt
+@@ -149,7 +153,7 @@ int set_modtime(char *fname, time_t modt
{
#ifdef HAVE_UTIMES
struct timeval t[2];
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
+@@ -160,12 +164,12 @@ int set_modtime(char *fname, time_t modt
return utimes(fname, t);
#elif defined HAVE_UTIMBUF
struct utimbuf tbuf;
t[1] = modtime;
return utime(fname,t);
#else
-@@ -1166,8 +1170,8 @@ int msleep(int t)
+@@ -1229,8 +1233,8 @@ int msleep(int t)
/**
* --modify-window).
*
* @retval 0 if the times should be treated as the same
-@@ -1176,7 +1180,7 @@ int msleep(int t)
+@@ -1239,7 +1243,7 @@ int msleep(int t)
*
* @retval -1 if the 2nd is later
**/
Matt McCutchen's Web Site / rsync / rsync-patches.git / blobdiff