make proto
---- orig/Makefile.in 2004-05-15 00:53:53
+--- orig/Makefile.in 2004-07-04 08:59:17
+++ Makefile.in 2004-07-03 20:13:41
@@ -34,7 +34,7 @@ ZLIBOBJ=zlib/deflate.o zlib/infblock.o z
OBJS1=rsync.o generator.o receiver.o cleanup.o sender.o exclude.o util.o \
+ }
+ return 0;
+}
---- orig/flist.c 2004-06-18 16:23:07
+--- orig/flist.c 2004-07-15 02:21:10
+++ flist.c 2004-07-03 20:13:41
@@ -33,6 +33,7 @@ extern int verbose;
extern int do_progress;
extern int am_daemon;
extern int always_checksum;
extern int module_id;
-@@ -67,6 +68,8 @@ extern int list_only;
- extern int read_batch;
- extern int write_batch;
+@@ -64,6 +65,8 @@ extern int delete_excluded;
+ extern int orig_umask;
+ extern int list_only;
+extern struct chmod_mode_struct *chmod_modes;
+
extern struct exclude_list_struct exclude_list;
extern struct exclude_list_struct server_exclude_list;
extern struct exclude_list_struct local_exclude_list;
-@@ -868,7 +871,10 @@ skip_excludes:
+@@ -865,7 +868,10 @@ skip_excludes:
file->flags = flags;
file->modtime = st.st_mtime;
file->length = st.st_size;
file->uid = st.st_uid;
file->gid = st.st_gid;
---- orig/options.c 2004-06-20 19:30:00
+--- orig/options.c 2004-07-15 16:51:50
+++ options.c 2004-07-03 20:13:41
@@ -124,6 +124,7 @@ char *log_format = NULL;
char *password_file = NULL;
char backup_dir_buf[MAXPATHLEN];
int rsync_port = RSYNC_PORT;
int link_dest = 0;
-@@ -137,6 +138,8 @@ int list_only = 0;
- #define MAX_BATCH_PREFIX_LEN 256 /* Must be less than MAXPATHLEN-13 */
- char *batch_prefix = NULL;
+@@ -136,6 +137,8 @@ int list_only = 0;
+ #define MAX_BATCH_NAME_LEN 256 /* Must be less than MAXPATHLEN-13 */
+ char *batch_name = NULL;
+struct chmod_mode_struct *chmod_modes = NULL;
+
static int daemon_opt; /* sets am_daemon after option error-reporting */
static int modify_window_set;
-@@ -245,6 +248,7 @@ void usage(enum logcode F)
+@@ -244,6 +247,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");
-@@ -350,6 +354,7 @@ static struct poptOption long_options[]
+@@ -349,6 +353,7 @@ static struct poptOption long_options[]
{"perms", 'p', POPT_ARG_NONE, &preserve_perms, 0, 0, 0 },
{"owner", 'o', POPT_ARG_NONE, &preserve_uid, 0, 0, 0 },
{"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 },
-@@ -730,6 +735,13 @@ int parse_arguments(int *argc, const cha
+@@ -729,6 +734,13 @@ int parse_arguments(int *argc, const cha
exit_cleanup(RERR_SYNTAX);
}
if (do_progress && !verbose)
verbose = 1;
-@@ -977,6 +989,11 @@ void server_options(char **args,int *arg
+@@ -969,6 +981,11 @@ void server_options(char **args,int *arg
args[ac++] = compare_dest;
}
if (files_from && (!am_sender || remote_filesfrom_file)) {
if (remote_filesfrom_file) {
args[ac++] = "--files-from";
---- orig/rsync.yo 2004-06-17 06:32:00
+--- orig/rsync.yo 2004-07-15 02:21:11
+++ rsync.yo 2004-07-03 20:13:41
@@ -300,6 +300,7 @@ verb(
-g, --group preserve group