Matt McCutchen's Web Site
/
rsync
/
rsync.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Preparing for release of 2.6.7pre3
[rsync/rsync.git]
/
chmod.c
diff --git
a/chmod.c
b/chmod.c
index
53aa059
..
ace57b9
100644
(file)
--- a/
chmod.c
+++ b/
chmod.c
@@
-1,6
+1,6
@@
#include "rsync.h"
#include "rsync.h"
-extern
in
t orig_umask;
+extern
mode_
t orig_umask;
#define FLAG_X_KEEP (1<<0)
#define FLAG_DIRS_ONLY (1<<1)
#define FLAG_X_KEEP (1<<0)
#define FLAG_DIRS_ONLY (1<<1)
@@
-56,15
+56,15
@@
struct chmod_mode_struct *parse_chmod(const char *modestr,
switch (op) {
case CHMOD_ADD:
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->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->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;
}
curr_mode->ModeOR = bits + topoct;
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 IsX = mode & 0111;
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))
for ( ; chmod_modes; chmod_modes = chmod_modes->next) {
if ((chmod_modes->flags & FLAG_DIRS_ONLY) && !S_ISDIR(NonPerm))