---- Makefile.in 10 Feb 2004 17:06:11 -0000 1.98
-+++ Makefile.in 20 Mar 2004 17:56:44 -0000
-@@ -34,7 +34,7 @@ ZLIBOBJ=zlib/deflate.o zlib/infblock.o z
+After applying this patch and running configure, you MUST run this
+command before "make":
+
+ make proto
+
+
+--- orig/Makefile.in 2005-07-07 23:11:07
++++ Makefile.in 2004-07-03 20:13:41
+@@ -33,7 +33,7 @@ ZLIBOBJ=zlib/deflate.o zlib/inffast.o zl
OBJS1=rsync.o generator.o receiver.o cleanup.o sender.o exclude.o util.o \
main.o checksum.o match.o syscall.o log.o backup.o
OBJS2=options.o flist.o io.o compat.o hlink.o token.o uidlist.o socket.o \
OBJS3=progress.o pipe.o
DAEMON_OBJ = params.o loadparm.o clientserver.o access.o connection.o authenticate.o
popt_OBJS=popt/findme.o popt/popt.o popt/poptconfig.o \
---- chmod.c 2004-02-13 17:08:33.000000000 -0800
-+++ chmod.c 2004-03-20 10:04:19.000000000 -0800
-@@ -0,0 +1,184 @@
+--- orig/chmod.c 2005-07-09 16:09:14
++++ chmod.c 2005-07-09 16:09:14
+@@ -0,0 +1,195 @@
+#include "rsync.h"
+
++extern int orig_umask;
++
+#define FLAG_X_KEEP (1<<0)
+#define FLAG_DIRS_ONLY (1<<1)
+#define FLAG_FILES_ONLY (1<<2)
+
+ while (state != STATE_ERROR) {
+ if (!*modestr || *modestr == ',') {
++ int bits;
++
+ if (!op) {
+ state = STATE_ERROR;
+ break;
+ first_mode = curr_mode;
+ curr_mode->next = NULL;
+
++ if (where)
++ bits = where * what;
++ else {
++ where = 0111;
++ bits = (where * what) & ~orig_umask;
++ }
++
+ switch (op) {
+ case CHMOD_ADD:
+ curr_mode->ModeAND = 07777;
-+ curr_mode->ModeOR = (where * what) + topoct;
++ curr_mode->ModeOR = bits + topoct;
+ break;
+ case CHMOD_SUB:
-+ curr_mode->ModeAND = 07777 - (where * what) - topoct;
++ curr_mode->ModeAND = 07777 - bits - topoct;
+ curr_mode->ModeOR = 0;
+ break;
+ case CHMOD_EQ:
-+ curr_mode->ModeAND = 07777 - (where * 7);
-+ curr_mode->ModeOR = where * what - topoct;
++ curr_mode->ModeAND = 07777 - (where * 7) - (topoct ? topbits : 0);
++ curr_mode->ModeOR = bits + topoct;
+ break;
+ }
+
+ }
+ return 0;
+}
---- flist.c 14 Apr 2004 23:33:34 -0000 1.213
-+++ flist.c 15 Apr 2004 19:00:26 -0000
-@@ -33,6 +33,7 @@ extern int verbose;
- extern int do_progress;
- extern int am_root;
- extern int am_server;
-+extern int am_sender;
- extern int am_daemon;
- extern int always_checksum;
- extern int module_id;
-@@ -64,6 +65,8 @@ extern int sanitize_paths;
- extern int read_batch;
- extern int write_batch;
+--- orig/flist.c 2005-08-17 06:45:07
++++ flist.c 2004-09-18 01:51:11
+@@ -62,6 +62,8 @@ extern struct file_list *the_file_list;
+
+ extern char curr_dir[MAXPATHLEN];
+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;
-@@ -853,7 +856,10 @@ skip_excludes:
+ extern struct filter_list_struct filter_list;
+ extern struct filter_list_struct server_filter_list;
+
+@@ -883,7 +885,10 @@ skip_filters:
file->flags = flags;
file->modtime = st.st_mtime;
file->length = st.st_size;
file->uid = st.st_uid;
file->gid = st.st_gid;
---- options.c 14 Apr 2004 23:33:34 -0000 1.146
-+++ options.c 15 Apr 2004 19:00:26 -0000
-@@ -121,6 +121,7 @@ char *log_format = NULL;
+--- orig/options.c 2005-08-27 21:11:26
++++ options.c 2005-08-27 21:18:52
+@@ -141,6 +141,7 @@ char *log_format = NULL;
char *password_file = NULL;
char *rsync_path = RSYNC_PATH;
char *backup_dir = NULL;
+char *chmod_mode = NULL;
char backup_dir_buf[MAXPATHLEN];
- int rsync_port = RSYNC_PORT;
- int link_dest = 0;
-@@ -134,6 +135,8 @@ int list_only = 0;
- #define MAX_BATCH_PREFIX_LEN 256 /* Must be less than MAXPATHLEN-13 */
- char *batch_prefix = NULL;
+ int rsync_port = 0;
+ int compare_dest = 0;
+@@ -160,6 +161,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 F_option_cnt = 0;
static int modify_window_set;
-
-@@ -241,6 +244,7 @@ void usage(enum logcode F)
- rprintf(F," -g, --group preserve group\n");
+@@ -289,6 +292,7 @@ void usage(enum logcode F)
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," --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 whole files, no incremental checks\n");
-@@ -344,6 +348,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 },
+ rprintf(F," -W, --whole-file copy files whole (without rsync algorithm)\n");
+@@ -411,6 +415,7 @@ static struct poptOption long_options[]
+ {"no-relative", 0, POPT_ARG_VAL, &relative_paths, 0, 0, 0 },
+ {"no-R", 0, POPT_ARG_VAL, &relative_paths, 0, 0, 0 },
+ {"no-implied-dirs", 0, POPT_ARG_VAL, &implied_dirs, 0, 0, 0 },
+ {"chmod", 0, POPT_ARG_STRING, &chmod_mode, 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 },
-@@ -720,6 +725,13 @@ int parse_arguments(int *argc, const cha
- exit_cleanup(RERR_SYNTAX);
- }
+ {"ignore-times", 'I', POPT_ARG_NONE, &ignore_times, 0, 0, 0 },
+ {"size-only", 0, POPT_ARG_NONE, &size_only, 0, 0, 0 },
+ {"one-file-system", 'x', POPT_ARG_NONE, &one_file_system, 0, 0, 0 },
+@@ -1122,6 +1127,13 @@ int parse_arguments(int *argc, const cha
+ if (make_backups && !backup_dir)
+ omit_dir_times = 1;
+ if (chmod_mode && !(chmod_modes = parse_chmod(chmod_mode))) {
+ snprintf(err_buf, sizeof err_buf,
+ return 0;
+ }
+
- if (do_progress && !verbose)
- verbose = 1;
+ if (log_format) {
+ if (log_format_has(log_format, 'i'))
+ log_format_has_i = 1;
+@@ -1507,6 +1519,11 @@ void server_options(char **args,int *arg
+ }
+ }
-@@ -951,6 +963,11 @@ void server_options(char **args,int *arg
- */
- args[ac++] = link_dest ? "--link-dest" : "--compare-dest";
- args[ac++] = compare_dest;
-+ }
-+
+ if (chmod_mode && !am_sender) {
+ args[ac++] = "--chmod";
+ args[ac++] = chmod_mode;
- }
-
- if (files_from && (!am_sender || remote_filesfrom_file)) {
---- proto.h 14 Apr 2004 23:33:30 -0000 1.188
-+++ proto.h 15 Apr 2004 19:00:26 -0000
-@@ -25,6 +25,9 @@ void file_checksum(char *fname,char *sum
- void sum_init(void);
- void sum_update(char *p, int len);
- void sum_end(char *sum);
-+struct chmod_mode_struct *parse_chmod(char *modestr);
-+int tweak_mode(int mode, struct chmod_mode_struct *chmod_modes);
-+int free_chmod_mode(struct chmod_mode_struct *chmod_modes);
- void close_all(void);
- void _exit_cleanup(int code, const char *file, int line);
- void cleanup_disable(void);
---- rsync.yo 15 Apr 2004 18:32:24 -0000 1.157
-+++ rsync.yo 15 Apr 2004 19:00:27 -0000
-@@ -299,6 +299,7 @@ verb(
- -g, --group preserve group
++ }
++
+ if (files_from && (!am_sender || filesfrom_host)) {
+ if (filesfrom_host) {
+ args[ac++] = "--files-from";
+--- orig/rsync.yo 2005-08-27 21:05:12
++++ rsync.yo 2005-01-24 01:48:43
+@@ -323,6 +323,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
+ --chmod=CHMOD change destination permissions
-S, --sparse handle sparse files efficiently
-n, --dry-run show what would have been transferred
- -W, --whole-file copy whole files, no incremental checks
-@@ -536,6 +537,14 @@ modified cannot be effective; in other w
- cause the next transfer to behave as if it used -I, and all files will have
- their checksums compared and show up in log messages even if they haven't
- changed.
-+
+ -W, --whole-file copy files whole (without rsync algorithm)
+@@ -695,6 +696,14 @@ 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(--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
+item that should only apply to a file by prefixing it with a 'F'. For example:
+
+quote(--chmod=Dg+s,ug+w,Fo-w,+X)
-
++
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.
---- testsuite/chmod.test 2004-02-13 17:08:33.000000000 -0800
-+++ testsuite/chmod.test Sat Mar 20 10:30:48 2004
-@@ -0,0 +1,43 @@
+
+--- orig/testsuite/chmod-option.test 2005-07-09 15:49:59
++++ testsuite/chmod-option.test 2005-07-09 15:49:59
+@@ -0,0 +1,44 @@
+#! /bin/sh
+
+# Copyright (C) 2002 by Martin Pool <mbp@samba.org>
+checkit "$RSYNC -avv \"$fromdir/\" \"$checkdir/\"" "$fromdir" "$checkdir"
+
+# And then manually make the changes which should occur
++umask 002
+chmod ug-s,a+rX "$checkdir"/*
-+chmod g+w "$checkdir" "$checkdir"/dir*
++chmod +w "$checkdir" "$checkdir"/dir*
+
-+checkit "$RSYNC -avv --chmod ug-s,a+rX,Dg+w \"$fromdir/\" \"$todir/\"" "$checkdir" "$todir"
++checkit "$RSYNC -avv --chmod ug-s,a+rX,D+w \"$fromdir/\" \"$todir/\"" "$checkdir" "$todir"
+
+# The script would have aborted on error, so getting here means we've won.
+exit 0
Matt McCutchen's Web Site / rsync / rsync-patches.git / blobdiff