Tweaked some whitespace to match the latest version from autoconf.

[rsync/rsync.git] / chmod.c

diff --git a/chmod.c b/chmod.c
index 95b2199..ace57b9 100644 (file)
--- a/chmod.c
+++ b/chmod.c
@@ -1,6 +1,6 @@
 #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,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 == ',') {
@@ -55,15 +56,15 @@ 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;
                        }
@@ -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;
 }
 
@@ -164,7 +174,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))