X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/0c983c1fd451ed50cc16b1fdba7f1a1ca3268fba..bd685982389b78a158921b7839bdeca501338d19:/chmod.c

diff --git a/chmod.c b/chmod.c
index 95b21999..74e3ad79 100644
--- a/chmod.c
+++ b/chmod.c
@@ -1,6 +1,27 @@
+/*
+ * Implement the core of the --chmod option.
+ *
+ * Copyright (C) 2002 Scott Howard
+ * Copyright (C) 2005-2009 Wayne Davison
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, visit the http://fsf.org website.
+ */
+
 #include "rsync.h"
+#include "itypes.h"
 
-extern int orig_umask;
+extern mode_t orig_umask;
 
 #define FLAG_X_KEEP (1<<0)
 #define FLAG_DIRS_ONLY (1<<1)
@@ -15,20 +36,23 @@ struct chmod_mode_struct {
 #define CHMOD_ADD 1
 #define CHMOD_SUB 2
 #define CHMOD_EQ  3
+#define CHMOD_SET 4
 
 #define STATE_ERROR 0
 #define STATE_1ST_HALF 1
 #define STATE_2ND_HALF 2
+#define STATE_OCTAL_NUM 3
 
 /* 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)
+ * pairs in a linked list.  We return a pointer to new items on succcess
+ * (appending the items to the specified list), or NULL on error. */
+struct chmod_mode_struct *parse_chmod(const char *modestr,
+				      struct chmod_mode_struct **root_mode_ptr)
 {
 	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;
+				 *prev_mode = NULL;
 
 	while (state != STATE_ERROR) {
 		if (!*modestr || *modestr == ',') {
@@ -55,17 +79,21 @@ struct chmod_mode_struct *parse_chmod(char *modestr)
 
 			switch (op) {
 			case CHMOD_ADD:
-				curr_mode->ModeAND = 07777;
+				curr_mode->ModeAND = CHMOD_BITS;
 				curr_mode->ModeOR  = bits + topoct;
 				break;
 			case CHMOD_SUB:
-				curr_mode->ModeAND = 07777 - bits - topoct;
+				curr_mode->ModeAND = CHMOD_BITS - bits - topoct;
 				curr_mode->ModeOR  = 0;
 				break;
 			case CHMOD_EQ:
-				curr_mode->ModeAND = 07777 - (where * 7) - (topoct ? topbits : 0);
+				curr_mode->ModeAND = CHMOD_BITS - (where * 7) - (topoct ? topbits : 0);
 				curr_mode->ModeOR  = bits + topoct;
 				break;
+			case CHMOD_SET:
+				curr_mode->ModeAND = 0;
+				curr_mode->ModeOR  = bits;
+				break;
 			}
 
 			curr_mode->flags = flags;
@@ -78,17 +106,18 @@ struct chmod_mode_struct *parse_chmod(char *modestr)
 			where = what = op = topoct = topbits = flags = 0;
 		}
 
-		if (state != STATE_2ND_HALF) {
+		switch (state) {
+		case STATE_1ST_HALF:
 			switch (*modestr) {
 			case 'D':
 				if (flags & FLAG_FILES_ONLY)
 					state = STATE_ERROR;
-			  	flags |= FLAG_DIRS_ONLY;
+				flags |= FLAG_DIRS_ONLY;
 				break;
 			case 'F':
 				if (flags & FLAG_DIRS_ONLY)
 					state = STATE_ERROR;
-			  	flags |= FLAG_FILES_ONLY;
+				flags |= FLAG_FILES_ONLY;
 				break;
 			case 'u':
 				where |= 0100;
@@ -117,10 +146,17 @@ struct chmod_mode_struct *parse_chmod(char *modestr)
 				state = STATE_2ND_HALF;
 				break;
 			default:
-				state = STATE_ERROR;
+				if (isDigit(modestr) && *modestr < '8' && !where) {
+					op = CHMOD_SET;
+					state =  STATE_OCTAL_NUM;
+					where = 1;
+					what = *modestr - '0';
+				} else
+					state = STATE_ERROR;
 				break;
 			}
-		} else {
+			break;
+		case STATE_2ND_HALF:
 			switch (*modestr) {
 			case 'r':
 				what |= 4;
@@ -129,7 +165,7 @@ struct chmod_mode_struct *parse_chmod(char *modestr)
 				what |= 2;
 				break;
 			case 'X':
-			  	flags |= FLAG_X_KEEP;
+				flags |= FLAG_X_KEEP;
 				/* FALL THROUGH */
 			case 'x':
 				what |= 1;
@@ -147,14 +183,32 @@ struct chmod_mode_struct *parse_chmod(char *modestr)
 				state = STATE_ERROR;
 				break;
 			}
+			break;
+		case STATE_OCTAL_NUM:
+			if (isDigit(modestr) && *modestr < '8') {
+				what = what*8 + *modestr - '0';
+				if (what > CHMOD_BITS)
+					state = STATE_ERROR;
+			} else
+				state = STATE_ERROR;
+			break;
 		}
 		modestr++;
 	}
 
 	if (state == STATE_ERROR) {
 		free_chmod_mode(first_mode);
-		first_mode = NULL;
+		return NULL;
+	}
+
+	if (!(curr_mode = *root_mode_ptr))
+		*root_mode_ptr = first_mode;
+	else {
+		while (curr_mode->next)
+			curr_mode = curr_mode->next;
+		curr_mode->next = first_mode;
 	}
+
 	return first_mode;
 }
 
@@ -164,7 +218,7 @@ struct chmod_mode_struct *parse_chmod(char *modestr)
 int tweak_mode(int mode, struct chmod_mode_struct *chmod_modes)
 {
 	int IsX = mode & 0111;
-	int NonPerm = mode & ~07777;
+	int NonPerm = mode & ~CHMOD_BITS;
 
 	for ( ; chmod_modes; chmod_modes = chmod_modes->next) {
 		if ((chmod_modes->flags & FLAG_DIRS_ONLY) && !S_ISDIR(NonPerm))