LineageOS/android_external_rsync
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- The orig_umask value is now a mode_t.

Browse Source 
- Use CHMOD_BITS instead of 07777.
This commit is contained in:
Wayne Davison
2006-02-24 01:56:18 +00:00
parent a92d6ff13c
commit a41d110647
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
chmod.c
View File

@@ -1,6 +1,6 @@
#include "rsync.h" #include "rsync.h"
extern int orig_umask; extern mode_t orig_umask;
#define FLAG_X_KEEP (1<<0) #define FLAG_X_KEEP (1<<0)
#define FLAG_DIRS_ONLY (1<<1) #define FLAG_DIRS_ONLY (1<<1)
@@ -56,15 +56,15 @@ struct chmod_mode_struct *parse_chmod(const char *modestr,
switch (op) { switch (op) {
case CHMOD_ADD: case CHMOD_ADD:
curr_mode->ModeAND = 07777; curr_mode->ModeAND = CHMOD_BITS;
curr_mode->ModeOR = bits + topoct; curr_mode->ModeOR = bits + topoct;
break; break;
case CHMOD_SUB: case CHMOD_SUB:
curr_mode->ModeAND = 07777 - bits - topoct; curr_mode->ModeAND = CHMOD_BITS - bits - topoct;
curr_mode->ModeOR = 0; curr_mode->ModeOR = 0;
break; break;
case CHMOD_EQ: 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; curr_mode->ModeOR = bits + topoct;
break; break;
} }
@@ -174,7 +174,7 @@ struct chmod_mode_struct *parse_chmod(const char *modestr,
int tweak_mode(int mode, struct chmod_mode_struct *chmod_modes) int tweak_mode(int mode, struct chmod_mode_struct *chmod_modes)
{ {
int IsX = mode & 0111; int IsX = mode & 0111;
int NonPerm = mode & ~07777; int NonPerm = mode & ~CHMOD_BITS;
for ( ; chmod_modes; chmod_modes = chmod_modes->next) { for ( ; chmod_modes; chmod_modes = chmod_modes->next) {
if ((chmod_modes->flags & FLAG_DIRS_ONLY) && !S_ISDIR(NonPerm)) if ((chmod_modes->flags & FLAG_DIRS_ONLY) && !S_ISDIR(NonPerm))