Use 0-length MSG_DATA when MSG_NOOP is not available
[rsync.git] / chmod.c
diff --git a/chmod.c b/chmod.c
index 53aa05959163d0be49c813dd2d1d974e06d69978..3d0d05df27af3f62abca19ef559d8e6f5df6ac2c 100644 (file)
--- 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)
@@ -56,15 +76,15 @@ struct chmod_mode_struct *parse_chmod(const 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;
                        }
@@ -84,12 +104,12 @@ struct chmod_mode_struct *parse_chmod(const char *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;
@@ -130,7 +150,7 @@ struct chmod_mode_struct *parse_chmod(const char *modestr,
                                what |= 2;
                                break;
                        case 'X':
-                               flags |= FLAG_X_KEEP;
+                               flags |= FLAG_X_KEEP;
                                /* FALL THROUGH */
                        case 'x':
                                what |= 1;
@@ -174,7 +194,7 @@ struct chmod_mode_struct *parse_chmod(const 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))