X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/81b096feef3773dfd17e384ffb9328287cdcea94..b3bf9b9df95137a3a43248be9599d919b04877af:/chmod.c

diff --git a/chmod.c b/chmod.c
index 8a6adfd8..3d0d05df 100644
--- a/chmod.c
+++ b/chmod.c
@@ -1,6 +1,26 @@
+/*
+ * 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"
 
-extern int orig_umask;
+extern mode_t orig_umask;
 
 #define FLAG_X_KEEP (1<<0)
 #define FLAG_DIRS_ONLY (1<<1)
@@ -21,9 +41,10 @@ struct chmod_mode_struct {
 #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. */
-int parse_chmod(const char *modestr, struct chmod_mode_struct **root_mode_ptr)
+ * 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;
@@ -55,15 +76,15 @@ int parse_chmod(const char *modestr, struct chmod_mode_struct **root_mode_ptr)
 
 			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;
 			}
@@ -83,12 +104,12 @@ int parse_chmod(const char *modestr, struct chmod_mode_struct **root_mode_ptr)
 			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;
@@ -129,7 +150,7 @@ int parse_chmod(const char *modestr, struct chmod_mode_struct **root_mode_ptr)
 				what |= 2;
 				break;
 			case 'X':
-			  	flags |= FLAG_X_KEEP;
+				flags |= FLAG_X_KEEP;
 				/* FALL THROUGH */
 			case 'x':
 				what |= 1;
@@ -153,7 +174,7 @@ int parse_chmod(const char *modestr, struct chmod_mode_struct **root_mode_ptr)
 
 	if (state == STATE_ERROR) {
 		free_chmod_mode(first_mode);
-		return 0;
+		return NULL;
 	}
 
 	if (!(curr_mode = *root_mode_ptr))
@@ -164,7 +185,7 @@ int parse_chmod(const char *modestr, struct chmod_mode_struct **root_mode_ptr)
 		curr_mode->next = first_mode;
 	}
 
-	return 1;
+	return first_mode;
 }
 
 
@@ -173,7 +194,7 @@ int parse_chmod(const char *modestr, struct chmod_mode_struct **root_mode_ptr)
 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))