char *password_file = NULL;
char *rsync_path = RSYNC_PATH;
char *backup_dir = NULL;
-char *chmod_mode = NULL;
char backup_dir_buf[MAXPATHLEN];
int rsync_port = 0;
int compare_dest = 0;
static int refused_delete, refused_archive_part, refused_compress;
static int refused_partial, refused_progress, refused_delete_before;
static int refused_inplace;
+static char *chmod_mode = NULL;
static char *max_size_arg, *min_size_arg;
static char partialdir_for_delayupdate[] = ".~tmp~";
{"chmod", 0, POPT_ARG_STRING, &chmod_mode, 0, 0, 0 },
{"ignore-times", 'I', POPT_ARG_NONE, &ignore_times, 0, 0, 0 },
{"size-only", 0, POPT_ARG_NONE, &size_only, 0, 0, 0 },
- {"one-file-system", 'x', POPT_ARG_NONE, &one_file_system, 0, 0, 0 },
+ {"one-file-system", 'x', POPT_ARG_NONE, 0, 'x', 0, 0 },
{"update", 'u', POPT_ARG_NONE, &update_only, 0, 0, 0 },
{"existing", 0, POPT_ARG_NONE, &ignore_non_existing, 0, 0, 0 },
{"ignore-non-existing",0,POPT_ARG_NONE, &ignore_non_existing, 0, 0, 0 },
quiet++;
break;
+ case 'x':
+ one_file_system++;
+ break;
+
case OPT_SENDER:
if (!am_server) {
usage(FERROR);
argstr[x++] = 'I';
if (relative_paths)
argstr[x++] = 'R';
- if (one_file_system)
+ if (one_file_system) {
argstr[x++] = 'x';
+ if (one_file_system > 1)
+ argstr[x++] = 'x';
+ }
if (sparse_files)
argstr[x++] = 'S';
if (do_compression)
}
}
- if (chmod_mode && !am_sender) {
- args[ac++] = "--chmod";
- args[ac++] = chmod_mode;
- }
-
if (files_from && (!am_sender || filesfrom_host)) {
if (filesfrom_host) {
args[ac++] = "--files-from";