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

diff --git a/chmod.c b/chmod.c
index 95b21999..53aa0595 100644
--- a/chmod.c
+++ b/chmod.c
@@ -21,14 +21,15 @@ 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. */
-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 == ',') {
@@ -153,8 +154,17 @@ struct chmod_mode_struct *parse_chmod(char *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;
 }