make proto
---- orig/Makefile.in 2004-07-04 08:59:17
+--- orig/Makefile.in 2004-08-09 21:07:09
+++ 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-07-15 02:21:10
+--- orig/flist.c 2004-08-11 23:42:23
+++ flist.c 2004-07-03 20:13:41
@@ -33,6 +33,7 @@ extern int verbose;
extern int do_progress;
extern struct exclude_list_struct exclude_list;
extern struct exclude_list_struct server_exclude_list;
extern struct exclude_list_struct local_exclude_list;
-@@ -865,7 +868,10 @@ skip_excludes:
+@@ -867,7 +870,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-07-15 16:51:50
+--- orig/options.c 2004-08-11 23:42:23
+++ options.c 2004-07-03 20:13:41
-@@ -124,6 +124,7 @@ char *log_format = NULL;
+@@ -126,6 +126,7 @@ char *log_format = NULL;
char *password_file = NULL;
char *rsync_path = RSYNC_PATH;
char *backup_dir = NULL;
char backup_dir_buf[MAXPATHLEN];
int rsync_port = RSYNC_PORT;
int link_dest = 0;
-@@ -136,6 +137,8 @@ int list_only = 0;
+@@ -138,6 +139,8 @@ int list_only = 0;
#define MAX_BATCH_NAME_LEN 256 /* Must be less than MAXPATHLEN-13 */
char *batch_name = NULL;
static int daemon_opt; /* sets am_daemon after option error-reporting */
static int modify_window_set;
-@@ -244,6 +247,7 @@ void usage(enum logcode F)
+@@ -253,6 +256,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");
-@@ -349,6 +353,7 @@ static struct poptOption long_options[]
+@@ -360,6 +364,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 },
-@@ -729,6 +734,13 @@ int parse_arguments(int *argc, const cha
- exit_cleanup(RERR_SYNTAX);
+@@ -808,6 +813,13 @@ int parse_arguments(int *argc, const cha
+ return 0;
}
+ if (chmod_mode && !(chmod_modes = parse_chmod(chmod_mode))) {
if (do_progress && !verbose)
verbose = 1;
-@@ -969,6 +981,11 @@ void server_options(char **args,int *arg
+@@ -1078,6 +1090,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-07-15 02:21:11
+--- orig/rsync.yo 2004-08-11 17:26:27
+++ rsync.yo 2004-07-03 20:13:41
-@@ -300,6 +300,7 @@ verb(
+@@ -301,6 +301,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
-@@ -552,6 +553,14 @@ cause the next transfer to behave as if
- their checksums compared and show up in log messages even if they haven't
- changed.
+@@ -574,6 +575,14 @@ 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).
+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
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.
---- orig/testsuite/chmod.test 2004-06-18 17:22:09
-+++ testsuite/chmod.test 2004-06-18 17:22:09
+--- orig/testsuite/chmod-option.test 2004-06-18 17:22:09
++++ testsuite/chmod-option.test 2004-06-18 17:22:09
@@ -0,0 +1,43 @@
+#! /bin/sh
+