make proto
---- orig/batch.c 2005-03-16 02:19:29.133830510
+--- orig/batch.c 2005-03-27 05:13:14
+++ batch.c 2004-07-03 20:15:41
-@@ -197,6 +197,8 @@ void show_flist(int index, struct file_s
+@@ -207,6 +207,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-03-16 02:19:29
+++ flist.c 2005-02-07 21:06:04
@@ -54,6 +54,7 @@ extern int relative_paths;
extern int implied_dirs;
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-03-29 01:05:12
+++ generator.c 2004-11-03 23:02:12
-@@ -373,7 +373,7 @@ static int unchanged_file(char *fn, stru
+@@ -372,7 +372,7 @@ static int unchanged_file(char *fn, stru
if (ignore_times)
return 0;
}
-@@ -838,7 +838,7 @@ static void recv_generator(char *fname,
+@@ -837,7 +837,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-03-28 20:56:55
+++ options.c 2005-02-21 10:53:28
@@ -50,6 +50,7 @@ int preserve_uid = 0;
int preserve_gid = 0;
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[]
+@@ -410,6 +412,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
+@@ -1273,6 +1276,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
+--- orig/rsync.c 2005-03-16 02:19:30
+++ rsync.c 2005-02-21 10:57:03
@@ -27,6 +27,7 @@ extern int dry_run;
extern int daemon_log_format_has_i;
}
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-03-28 20:56:55
+++ rsync.h 2004-07-03 20:15:41
@@ -54,6 +54,7 @@
#define XMIT_HAS_IDEV_DATA (1<<9)
uid_t uid;
gid_t gid;
mode_t mode;
---- orig/rsync.yo 2005-03-16 02:19:30.727691806
+--- orig/rsync.yo 2005-03-28 20:56:55
+++ rsync.yo 2005-01-24 01:57:18
@@ -321,6 +321,7 @@ to the detailed description below for a
-D, --devices preserve devices (root only)
-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
+@@ -655,6 +656,11 @@ 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).
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
+--- orig/util.c 2005-03-17 09:05:21
+++ util.c 2005-02-07 21:09:12
@@ -128,12 +128,17 @@ void overflow(char *str)