[rsync/rsync-patches.git] / chmod-option.diff

After applying this patch and running configure, you MUST run this
command before "make":

    make proto


--- orig/Makefile.in	2004-11-02 16:47:15
+++ 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 \
 	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 \
-	fileio.o batch.o clientname.o
+	fileio.o batch.o clientname.o chmod.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 \
--- orig/chmod.c	2004-06-18 17:22:08
+++ chmod.c	2004-06-18 17:22:08
@@ -0,0 +1,184 @@
+#include "rsync.h"
+
+#define FLAG_X_KEEP (1<<0)
+#define FLAG_DIRS_ONLY (1<<1)
+#define FLAG_FILES_ONLY (1<<2)
+
+struct chmod_mode_struct {
+	struct chmod_mode_struct *next;
+	int ModeAND, ModeOR;
+	char flags;
+};
+
+#define CHMOD_ADD 1
+#define CHMOD_SUB 2
+#define CHMOD_EQ  3
+
+#define STATE_ERROR 0
+#define STATE_1ST_HALF 1
+#define STATE_2ND_HALF 2
+
+/* Parse a chmod-style argument, and break it down into one or more AND/OR
+ * pairs in a linked list.  We use a state machine to walk through the
+ * options. */
+struct chmod_mode_struct *parse_chmod(char *modestr)
+{
+	int state = STATE_1ST_HALF;
+	int where = 0, what = 0, op = 0, topbits = 0, topoct = 0, flags = 0;
+	struct chmod_mode_struct *first_mode = NULL, *curr_mode = NULL,
+	    *prev_mode = NULL;
+
+	while (state != STATE_ERROR) {
+		if (!*modestr || *modestr == ',') {
+			if (!op) {
+				state = STATE_ERROR;
+				break;
+			}
+			prev_mode = curr_mode;
+			curr_mode = new_array(struct chmod_mode_struct, 1);
+			if (prev_mode)
+				prev_mode->next = curr_mode;
+			else
+				first_mode = curr_mode;
+			curr_mode->next = NULL;
+
+			switch (op) {
+			case CHMOD_ADD:
+				curr_mode->ModeAND = 07777;
+				curr_mode->ModeOR  = (where * what) + topoct;
+				break;
+			case CHMOD_SUB:
+				curr_mode->ModeAND = 07777 - (where * what) - topoct;
+				curr_mode->ModeOR  = 0;
+				break;
+			case CHMOD_EQ:
+				curr_mode->ModeAND = 07777 - (where * 7);
+				curr_mode->ModeOR  = where * what - topoct;
+				break;
+			}
+
+			curr_mode->flags = flags;
+
+			if (!*modestr)
+				break;
+			modestr++;
+
+			state = STATE_1ST_HALF;
+			where = what = op = topoct = topbits = flags = 0;
+		}
+
+		if (state != STATE_2ND_HALF) {
+			switch (*modestr) {
+			case 'D':
+				if (flags & FLAG_FILES_ONLY)
+					state = STATE_ERROR;
+			  	flags |= FLAG_DIRS_ONLY;
+				break;
+			case 'F':
+				if (flags & FLAG_DIRS_ONLY)
+					state = STATE_ERROR;
+			  	flags |= FLAG_FILES_ONLY;
+				break;
+			case 'u':
+				where |= 0100;
+				topbits |= 04000;
+				break;
+			case 'g':
+				where |= 0010;
+				topbits |= 02000;
+				break;
+			case 'o':
+				where |= 0001;
+				break;
+			case 'a':
+				where |= 0111;
+				break;
+			case '+':
+				op = CHMOD_ADD;
+				state = STATE_2ND_HALF;
+				break;
+			case '-':
+				op = CHMOD_SUB;
+				state = STATE_2ND_HALF;
+				break;
+			case '=':
+				op = CHMOD_EQ;
+				state = STATE_2ND_HALF;
+				break;
+			default:
+				state = STATE_ERROR;
+				break;
+			}
+		} else {
+			switch (*modestr) {
+			case 'r':
+				what |= 4;
+				break;
+			case 'w':
+				what |= 2;
+				break;
+			case 'X':
+			  	flags |= FLAG_X_KEEP;
+				/* FALL THROUGH */
+			case 'x':
+				what |= 1;
+				break;
+			case 's':
+				if (topbits)
+					topoct |= topbits;
+				else
+					topoct = 04000;
+				break;
+			case 't':
+				topoct |= 01000;
+				break;
+			default:
+				state = STATE_ERROR;
+				break;
+			}
+		}
+		modestr++;
+	}
+
+	if (state == STATE_ERROR) {
+		free_chmod_mode(first_mode);
+		first_mode = NULL;
+	}
+	return first_mode;
+}
+
+
+/* Takes an existing file permission and a list of AND/OR changes, and
+ * create a new permissions. */
+int tweak_mode(int mode, struct chmod_mode_struct *chmod_modes)
+{
+	int IsX = mode & 0111;
+	int NonPerm = mode & ~07777;
+
+	for ( ; chmod_modes; chmod_modes = chmod_modes->next) {
+		if ((chmod_modes->flags & FLAG_DIRS_ONLY) && !S_ISDIR(NonPerm))
+			continue;
+		if ((chmod_modes->flags & FLAG_FILES_ONLY) && S_ISDIR(NonPerm))
+			continue;
+		mode &= chmod_modes->ModeAND;
+		if ((chmod_modes->flags & FLAG_X_KEEP) && !IsX && !S_ISDIR(NonPerm))
+			mode |= chmod_modes->ModeOR & ~0111;
+		else
+			mode |= chmod_modes->ModeOR;
+	}
+
+	return mode | NonPerm;
+}
+
+/* Free the linked list created by parse_chmod. */
+int free_chmod_mode(struct chmod_mode_struct *chmod_modes)
+{
+	struct chmod_mode_struct *next;
+
+	while (chmod_modes) {
+		next = chmod_modes->next;
+		free(chmod_modes);
+		chmod_modes = next;
+	}
+	return 0;
+}
--- orig/flist.c	2005-04-28 15:56:50
+++ 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 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->mode = st.st_mode;
+	if (chmod_modes && am_sender && (S_ISREG(st.st_mode) || S_ISDIR(st.st_mode)))
+		file->mode = tweak_mode(st.st_mode, chmod_modes);
+	else
+		file->mode = st.st_mode;
 	file->uid = st.st_uid;
 	file->gid = st.st_gid;
 
--- orig/options.c	2005-05-10 15:32:58
+++ options.c	2005-03-01 01:26:56
@@ -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 = 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;
@@ -287,6 +290,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 files whole (without rsync algorithm)\n");
@@ -411,6 +415,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 },
+  {"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 },
   {"omit-dir-times",  'O', POPT_ARG_VAL,    &omit_dir_times, 2, 0, 0 },
@@ -1096,6 +1101,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,
+		    "Invalid argument passed to chmod\n");
+		rprintf(FERROR, "ERROR: %s", err_buf);
+		return 0;
+	}
+
 	if (log_format) {
 		if (log_format_has(log_format, 'i'))
 			log_format_has_i = 1;
@@ -1462,6 +1474,11 @@ void server_options(char **args,int *arg
 		}
 	}
 
+	if (chmod_mode && !am_sender) {
+		args[ac++] = "--chmod";
+		args[ac++] = chmod_mode;
+	}
+
 	if (files_from && (!am_sender || filesfrom_host)) {
 		if (filesfrom_host) {
 			args[ac++] = "--files-from";
--- orig/rsync.yo	2005-05-10 16:14:33
+++ rsync.yo	2005-01-24 01:48:43
@@ -322,6 +322,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 files whole (without rsync algorithm)
@@ -659,6 +660,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
+should only apply to a directory by prefixing it with a 'D', or specify an
+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.
 
--- 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
+
+# Copyright (C) 2002 by Martin Pool <mbp@samba.org>
+
+# This program is distributable under the terms of the GNU GPL (see
+# COPYING).
+
+# Test that the --chmod option functions correctly.
+
+. $srcdir/testsuite/rsync.fns
+
+set -x
+
+# Build some files
+
+fromdir="$scratchdir/from"
+todir="$scratchdir/to"
+checkdir="$scratchdir/check"
+
+mkdir "$fromdir"
+name1="$fromdir/name1"
+name2="$fromdir/name2"
+dir1="$fromdir/dir1"
+dir2="$fromdir/dir2"
+echo "This is the file" > "$name1"
+echo "This is the other file" > "$name2"
+mkdir "$dir1" "$dir2"
+
+chmod 4700 "$name1" || test_skipped "Can't chmod"
+chmod 700 "$dir1"
+chmod 770 "$dir2"
+
+# Copy the files we've created over to another directory
+checkit "$RSYNC -avv \"$fromdir/\" \"$checkdir/\"" "$fromdir" "$checkdir"
+
+# And then manually make the changes which should occur 
+chmod ug-s,a+rX "$checkdir"/*
+chmod g+w "$checkdir" "$checkdir"/dir*
+
+checkit "$RSYNC -avv --chmod ug-s,a+rX,Dg+w \"$fromdir/\" \"$todir/\"" "$checkdir" "$todir"
+
+# The script would have aborted on error, so getting here means we've won.
+exit 0
Commit	Line	Data
8a529471 WD	1	After applying this patch and running configure, you MUST run this
	2	command before "make":
	3
	4	make proto
	5
	6
36bbf3d1	7	--- orig/Makefile.in 2004-11-02 16:47:15
13bed3dd	8	+++ Makefile.in 2004-07-03 20:13:41
2ece3e77 WD	9	@@ -34,7 +34,7 @@ ZLIBOBJ=zlib/deflate.o zlib/infblock.o z
	10	OBJS1=rsync.o generator.o receiver.o cleanup.o sender.o exclude.o util.o \
	11	main.o checksum.o match.o syscall.o log.o backup.o
	12	OBJS2=options.o flist.o io.o compat.o hlink.o token.o uidlist.o socket.o \
	13	- fileio.o batch.o clientname.o
	14	+ fileio.o batch.o clientname.o chmod.o
	15	OBJS3=progress.o pipe.o
bd006671 MP	16	DAEMON_OBJ = params.o loadparm.o clientserver.o access.o connection.o authenticate.o
bd006671 MP	17	popt_OBJS=popt/findme.o popt/popt.o popt/poptconfig.o \
13bed3dd WD	18	--- orig/chmod.c 2004-06-18 17:22:08
13bed3dd WD	19	+++ chmod.c 2004-06-18 17:22:08
548aa120	20	@@ -0,0 +1,184 @@
bd006671 MP	21	+#include "rsync.h"
bd006671 MP	22	+
548aa120 WD	23	+#define FLAG_X_KEEP (1<<0)
	24	+#define FLAG_DIRS_ONLY (1<<1)
	25	+#define FLAG_FILES_ONLY (1<<2)
	26	+
bd006671	27	+struct chmod_mode_struct {
bd006671	28	+ struct chmod_mode_struct *next;
548aa120 WD	29	+ int ModeAND, ModeOR;
548aa120 WD	30	+ char flags;
bd006671 MP	31	+};
	32	+
	33	+#define CHMOD_ADD 1
	34	+#define CHMOD_SUB 2
	35	+#define CHMOD_EQ 3
	36	+
548aa120 WD	37	+#define STATE_ERROR 0
	38	+#define STATE_1ST_HALF 1
	39	+#define STATE_2ND_HALF 2
	40	+
bd006671	41	+/* Parse a chmod-style argument, and break it down into one or more AND/OR
548aa120 WD	42	+ * pairs in a linked list. We use a state machine to walk through the
548aa120 WD	43	+ * options. */
2ece3e77	44	+struct chmod_mode_struct parse_chmod(char modestr)
bd006671	45	+{
548aa120 WD	46	+ int state = STATE_1ST_HALF;
548aa120 WD	47	+ int where = 0, what = 0, op = 0, topbits = 0, topoct = 0, flags = 0;
2ece3e77 WD	48	+ struct chmod_mode_struct first_mode = NULL, curr_mode = NULL,
2ece3e77 WD	49	+ *prev_mode = NULL;
bd006671	50	+
548aa120 WD	51	+ while (state != STATE_ERROR) {
	52	+ if (!modestr \|\| modestr == ',') {
	53	+ if (!op) {
	54	+ state = STATE_ERROR;
	55	+ break;
	56	+ }
	57	+ prev_mode = curr_mode;
	58	+ curr_mode = new_array(struct chmod_mode_struct, 1);
	59	+ if (prev_mode)
	60	+ prev_mode->next = curr_mode;
	61	+ else
	62	+ first_mode = curr_mode;
	63	+ curr_mode->next = NULL;
	64	+
	65	+ switch (op) {
	66	+ case CHMOD_ADD:
	67	+ curr_mode->ModeAND = 07777;
	68	+ curr_mode->ModeOR = (where * what) + topoct;
	69	+ break;
	70	+ case CHMOD_SUB:
	71	+ curr_mode->ModeAND = 07777 - (where * what) - topoct;
	72	+ curr_mode->ModeOR = 0;
	73	+ break;
	74	+ case CHMOD_EQ:
	75	+ curr_mode->ModeAND = 07777 - (where * 7);
	76	+ curr_mode->ModeOR = where * what - topoct;
	77	+ break;
	78	+ }
	79	+
	80	+ curr_mode->flags = flags;
	81	+
	82	+ if (!*modestr)
	83	+ break;
	84	+ modestr++;
	85	+
	86	+ state = STATE_1ST_HALF;
	87	+ where = what = op = topoct = topbits = flags = 0;
	88	+ }
	89	+
	90	+ if (state != STATE_2ND_HALF) {
2ece3e77	91	+ switch (*modestr) {
548aa120 WD	92	+ case 'D':
	93	+ if (flags & FLAG_FILES_ONLY)
	94	+ state = STATE_ERROR;
	95	+ flags \|= FLAG_DIRS_ONLY;
	96	+ break;
	97	+ case 'F':
	98	+ if (flags & FLAG_DIRS_ONLY)
	99	+ state = STATE_ERROR;
	100	+ flags \|= FLAG_FILES_ONLY;
	101	+ break;
2ece3e77 WD	102	+ case 'u':
	103	+ where \|= 0100;
	104	+ topbits \|= 04000;
	105	+ break;
	106	+ case 'g':
	107	+ where \|= 0010;
	108	+ topbits \|= 02000;
	109	+ break;
	110	+ case 'o':
	111	+ where \|= 0001;
	112	+ break;
	113	+ case 'a':
	114	+ where \|= 0111;
	115	+ break;
	116	+ case '+':
	117	+ op = CHMOD_ADD;
548aa120	118	+ state = STATE_2ND_HALF;
2ece3e77 WD	119	+ break;
	120	+ case '-':
	121	+ op = CHMOD_SUB;
548aa120	122	+ state = STATE_2ND_HALF;
2ece3e77 WD	123	+ break;
	124	+ case '=':
	125	+ op = CHMOD_EQ;
548aa120	126	+ state = STATE_2ND_HALF;
2ece3e77 WD	127	+ break;
2ece3e77 WD	128	+ default:
548aa120	129	+ state = STATE_ERROR;
2ece3e77 WD	130	+ break;
	131	+ }
	132	+ } else {
	133	+ switch (*modestr) {
	134	+ case 'r':
	135	+ what \|= 4;
	136	+ break;
	137	+ case 'w':
	138	+ what \|= 2;
	139	+ break;
	140	+ case 'X':
548aa120	141	+ flags \|= FLAG_X_KEEP;
2ece3e77 WD	142	+ /* FALL THROUGH */
	143	+ case 'x':
	144	+ what \|= 1;
	145	+ break;
	146	+ case 's':
	147	+ if (topbits)
bd006671	148	+ topoct \|= topbits;
2ece3e77	149	+ else
bd006671	150	+ topoct = 04000;
2ece3e77 WD	151	+ break;
	152	+ case 't':
	153	+ topoct \|= 01000;
	154	+ break;
	155	+ default:
548aa120	156	+ state = STATE_ERROR;
2ece3e77 WD	157	+ break;
2ece3e77 WD	158	+ }
bd006671	159	+ }
2ece3e77	160	+ modestr++;
bd006671 MP	161	+ }
bd006671 MP	162	+
548aa120	163	+ if (state == STATE_ERROR) {
bd006671	164	+ free_chmod_mode(first_mode);
2ece3e77	165	+ first_mode = NULL;
bd006671 MP	166	+ }
	167	+ return first_mode;
	168	+}
	169	+
	170	+
2ece3e77 WD	171	+/* Takes an existing file permission and a list of AND/OR changes, and
2ece3e77 WD	172	+ * create a new permissions. */
548aa120	173	+int tweak_mode(int mode, struct chmod_mode_struct *chmod_modes)
bd006671	174	+{
548aa120 WD	175	+ int IsX = mode & 0111;
	176	+ int NonPerm = mode & ~07777;
	177	+
	178	+ for ( ; chmod_modes; chmod_modes = chmod_modes->next) {
	179	+ if ((chmod_modes->flags & FLAG_DIRS_ONLY) && !S_ISDIR(NonPerm))
	180	+ continue;
	181	+ if ((chmod_modes->flags & FLAG_FILES_ONLY) && S_ISDIR(NonPerm))
	182	+ continue;
	183	+ mode &= chmod_modes->ModeAND;
	184	+ if ((chmod_modes->flags & FLAG_X_KEEP) && !IsX && !S_ISDIR(NonPerm))
	185	+ mode \|= chmod_modes->ModeOR & ~0111;
2ece3e77	186	+ else
548aa120	187	+ mode \|= chmod_modes->ModeOR;
bd006671 MP	188	+ }
bd006671 MP	189	+
548aa120	190	+ return mode \| NonPerm;
bd006671 MP	191	+}
bd006671 MP	192	+
2ece3e77 WD	193	+/* Free the linked list created by parse_chmod. */
2ece3e77 WD	194	+int free_chmod_mode(struct chmod_mode_struct *chmod_modes)
bd006671 MP	195	+{
	196	+ struct chmod_mode_struct *next;
	197	+
	198	+ while (chmod_modes) {
	199	+ next = chmod_modes->next;
	200	+ free(chmod_modes);
	201	+ chmod_modes = next;
	202	+ }
	203	+ return 0;
	204	+}
388bf7cc	205	--- orig/flist.c 2005-04-28 15:56:50
a6587818	206	+++ flist.c 2004-09-18 01:51:11
36bbf3d1	207	@@ -62,6 +62,8 @@ extern struct file_list *the_file_list;
33840e0c WD	208
33840e0c WD	209	extern char curr_dir[MAXPATHLEN];
bd006671 MP	210
	211	+extern struct chmod_mode_struct *chmod_modes;
	212	+
4f9b6a01 WD	213	extern struct filter_list_struct filter_list;
4f9b6a01 WD	214	extern struct filter_list_struct server_filter_list;
ac23c334	215
388bf7cc	216	@@ -883,7 +885,10 @@ skip_filters:
2ece3e77 WD	217	file->flags = flags;
	218	file->modtime = st.st_mtime;
	219	file->length = st.st_size;
	220	- file->mode = st.st_mode;
46b46be7	221	+ if (chmod_modes && am_sender && (S_ISREG(st.st_mode) \|\| S_ISDIR(st.st_mode)))
2ece3e77 WD	222	+ file->mode = tweak_mode(st.st_mode, chmod_modes);
	223	+ else
	224	+ file->mode = st.st_mode;
	225	file->uid = st.st_uid;
	226	file->gid = st.st_gid;
bd006671	227
e33d747e	228	--- orig/options.c 2005-05-10 15:32:58
def2ace9	229	+++ options.c 2005-03-01 01:26:56
388bf7cc	230	@@ -141,6 +141,7 @@ char *log_format = NULL;
bd006671 MP	231	char *password_file = NULL;
	232	char *rsync_path = RSYNC_PATH;
	233	char *backup_dir = NULL;
	234	+char *chmod_mode = NULL;
2ece3e77	235	char backup_dir_buf[MAXPATHLEN];
4c1f2ca5	236	int rsync_port = 0;
c59d6641	237	int compare_dest = 0;
388bf7cc	238	@@ -160,6 +161,8 @@ int list_only = 0;
9be39c35 WD	239	#define MAX_BATCH_NAME_LEN 256 /* Must be less than MAXPATHLEN-13 */
9be39c35 WD	240	char *batch_name = NULL;
bd006671 MP	241
bd006671 MP	242	+struct chmod_mode_struct *chmod_modes = NULL;
2ece3e77 WD	243	+
2ece3e77 WD	244	static int daemon_opt; /* sets am_daemon after option error-reporting */
ac23c334	245	static int F_option_cnt = 0;
2ece3e77	246	static int modify_window_set;
388bf7cc	247	@@ -287,6 +290,7 @@ void usage(enum logcode F)
bd006671	248	rprintf(F," -D, --devices preserve devices (root only)\n");
2ece3e77	249	rprintf(F," -t, --times preserve times\n");
9a21ad72	250	rprintf(F," -O, --omit-dir-times omit directories when preserving times\n");
548aa120	251	+ rprintf(F," --chmod=CHMOD change destination permissions\n");
bd006671 MP	252	rprintf(F," -S, --sparse handle sparse files efficiently\n");
bd006671 MP	253	rprintf(F," -n, --dry-run show what would have been transferred\n");
45f1b149	254	rprintf(F," -W, --whole-file copy files whole (without rsync algorithm)\n");
388bf7cc	255	@@ -411,6 +415,7 @@ static struct poptOption long_options[]
2ece3e77 WD	256	{"perms", 'p', POPT_ARG_NONE, &preserve_perms, 0, 0, 0 },
	257	{"owner", 'o', POPT_ARG_NONE, &preserve_uid, 0, 0, 0 },
	258	{"group", 'g', POPT_ARG_NONE, &preserve_gid, 0, 0, 0 },
	259	+ {"chmod", 0, POPT_ARG_STRING, &chmod_mode, 0, 0, 0 },
	260	{"devices", 'D', POPT_ARG_NONE, &preserve_devices, 0, 0, 0 },
	261	{"times", 't', POPT_ARG_NONE, &preserve_times, 0, 0, 0 },
55173c4e	262	{"omit-dir-times", 'O', POPT_ARG_VAL, &omit_dir_times, 2, 0, 0 },
388bf7cc	263	@@ -1096,6 +1101,13 @@ int parse_arguments(int *argc, const cha
55173c4e WD	264	if (make_backups && !backup_dir)
55173c4e WD	265	omit_dir_times = 1;
bd006671	266
2ece3e77 WD	267	+ if (chmod_mode && !(chmod_modes = parse_chmod(chmod_mode))) {
	268	+ snprintf(err_buf, sizeof err_buf,
	269	+ "Invalid argument passed to chmod\n");
	270	+ rprintf(FERROR, "ERROR: %s", err_buf);
	271	+ return 0;
	272	+ }
	273	+
4e75164f	274	if (log_format) {
18ae7b87	275	if (log_format_has(log_format, 'i'))
33840e0c	276	log_format_has_i = 1;
388bf7cc	277	@@ -1462,6 +1474,11 @@ void server_options(char *args,int arg
4c1f2ca5	278	}
7628f156 WD	279	}
7628f156 WD	280
bd006671 MP	281	+ if (chmod_mode && !am_sender) {
	282	+ args[ac++] = "--chmod";
	283	+ args[ac++] = chmod_mode;
7628f156 WD	284	+ }
7628f156 WD	285	+
def2ace9 WD	286	if (files_from && (!am_sender \|\| filesfrom_host)) {
def2ace9 WD	287	if (filesfrom_host) {
7628f156	288	args[ac++] = "--files-from";
e33d747e	289	--- orig/rsync.yo 2005-05-10 16:14:33
9a21ad72	290	+++ rsync.yo 2005-01-24 01:48:43
e33d747e	291	@@ -322,6 +322,7 @@ to the detailed description below for a
2ece3e77 WD	292	-D, --devices preserve devices (root only)
2ece3e77 WD	293	-t, --times preserve times
9a21ad72	294	-O, --omit-dir-times omit directories when preserving times
2ece3e77 WD	295	+ --chmod=CHMOD change destination permissions
	296	-S, --sparse handle sparse files efficiently
	297	-n, --dry-run show what would have been transferred
45f1b149	298	-W, --whole-file copy files whole (without rsync algorithm)
e33d747e	299	@@ -659,6 +660,14 @@ it is preserving modification times (see
a7219d20	300	the directories on the receiving side, it is a good idea to use bf(-O).
333b8af4	301	This option is inferred if you use bf(--backup) without bf(--backup-dir).
7628f156	302
bd006671	303	+dit(bf(--chmod)) This options tells rsync to apply the listed "chmod" pattern
548aa120 WD	304	+to the permission of the files on the destination. In addition to the normal
	305	+parsing rules specified in the chmod manpage, you can specify an item that
	306	+should only apply to a directory by prefixing it with a 'D', or specify an
	307	+item that should only apply to a file by prefixing it with a 'F'. For example:
	308	+
	309	+quote(--chmod=Dg+s,ug+w,Fo-w,+X)
7628f156	310	+
bd006671 MP	311	dit(bf(-n, --dry-run)) This tells rsync to not do any file transfers,
bd006671 MP	312	instead it will just report the actions it would have taken.
7628f156	313
f635ed27 WD	314	--- orig/testsuite/chmod-option.test 2004-06-18 17:22:09
f635ed27 WD	315	+++ testsuite/chmod-option.test 2004-06-18 17:22:09
46b46be7	316	@@ -0,0 +1,43 @@
bd006671 MP	317	+#! /bin/sh
	318	+
	319	+# Copyright (C) 2002 by Martin Pool <mbp@samba.org>
	320	+
	321	+# This program is distributable under the terms of the GNU GPL (see
	322	+# COPYING).
	323	+
	324	+# Test that the --chmod option functions correctly.
	325	+
	326	+. $srcdir/testsuite/rsync.fns
	327	+
	328	+set -x
	329	+
	330	+# Build some files
	331	+
	332	+fromdir="$scratchdir/from"
	333	+todir="$scratchdir/to"
	334	+checkdir="$scratchdir/check"
	335	+
	336	+mkdir "$fromdir"
	337	+name1="$fromdir/name1"
	338	+name2="$fromdir/name2"
46b46be7 WD	339	+dir1="$fromdir/dir1"
46b46be7 WD	340	+dir2="$fromdir/dir2"
bd006671 MP	341	+echo "This is the file" > "$name1"
bd006671 MP	342	+echo "This is the other file" > "$name2"
46b46be7	343	+mkdir "$dir1" "$dir2"
bd006671	344	+
46b46be7 WD	345	+chmod 4700 "$name1" \|\| test_skipped "Can't chmod"
	346	+chmod 700 "$dir1"
	347	+chmod 770 "$dir2"
bd006671 MP	348	+
bd006671 MP	349	+# Copy the files we've created over to another directory
2ece3e77	350	+checkit "$RSYNC -avv \"$fromdir/\" \"$checkdir/\"" "$fromdir" "$checkdir"
bd006671 MP	351	+
bd006671 MP	352	+# And then manually make the changes which should occur
46b46be7 WD	353	+chmod ug-s,a+rX "$checkdir"/*
46b46be7 WD	354	+chmod g+w "$checkdir" "$checkdir"/dir*
bd006671	355	+
46b46be7	356	+checkit "$RSYNC -avv --chmod ug-s,a+rX,Dg+w \"$fromdir/\" \"$todir/\"" "$checkdir" "$todir"
bd006671	357	+
2ece3e77	358	+# The script would have aborted on error, so getting here means we've won.
bd006671	359	+exit 0