* Implement the core of the --chmod option.
*
* Copyright (C) 2002 Scott Howard
- * Copyright (C) 2005-2007 Wayne Davison
+ * 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
*/
#include "rsync.h"
+#include "itypes.h"
extern mode_t orig_umask;
#define CHMOD_ADD 1
#define CHMOD_SUB 2
#define CHMOD_EQ 3
+#define CHMOD_SET 4
#define STATE_ERROR 0
#define STATE_1ST_HALF 1
#define STATE_2ND_HALF 2
+#define STATE_OCTAL_NUM 3
/* Parse a chmod-style argument, and break it down into one or more AND/OR
* pairs in a linked list. We return a pointer to new items on succcess
curr_mode->ModeAND = CHMOD_BITS - (where * 7) - (topoct ? topbits : 0);
curr_mode->ModeOR = bits + topoct;
break;
+ case CHMOD_SET:
+ curr_mode->ModeAND = 0;
+ curr_mode->ModeOR = bits;
+ break;
}
curr_mode->flags = flags;
where = what = op = topoct = topbits = flags = 0;
}
- if (state != STATE_2ND_HALF) {
+ switch (state) {
+ case STATE_1ST_HALF:
switch (*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;
state = STATE_2ND_HALF;
break;
default:
- state = STATE_ERROR;
+ if (isDigit(modestr) && *modestr < '8' && !where) {
+ op = CHMOD_SET;
+ state = STATE_OCTAL_NUM;
+ where = 1;
+ what = *modestr - '0';
+ } else
+ state = STATE_ERROR;
break;
}
- } else {
+ break;
+ case STATE_2ND_HALF:
switch (*modestr) {
case 'r':
what |= 4;
what |= 2;
break;
case 'X':
- flags |= FLAG_X_KEEP;
+ flags |= FLAG_X_KEEP;
/* FALL THROUGH */
case 'x':
what |= 1;
state = STATE_ERROR;
break;
}
+ break;
+ case STATE_OCTAL_NUM:
+ if (isDigit(modestr) && *modestr < '8') {
+ what = what*8 + *modestr - '0';
+ if (what > CHMOD_BITS)
+ state = STATE_ERROR;
+ } else
+ state = STATE_ERROR;
+ break;
}
modestr++;
}