extern int select_timeout;
extern char curr_dir[MAXPATHLEN];
extern struct exclude_list_struct exclude_list;
+extern struct exclude_list_struct server_exclude_list;
int make_backups = 0;
rprintf(F," -W, --whole-file copy whole files, no incremental checks\n");
rprintf(F," --no-whole-file turn off --whole-file\n");
rprintf(F," -x, --one-file-system don't cross filesystem boundaries\n");
- rprintf(F," -B, --block-size=SIZE checksum blocking size (default %d)\n",BLOCK_SIZE);
+ rprintf(F," -B, --block-size=SIZE force a fixed checksum block-size\n");
rprintf(F," -e, --rsh=COMMAND specify the remote shell\n");
rprintf(F," --rsync-path=PATH specify path to rsync on the remote machine\n");
rprintf(F," --existing only update files that already exist\n");
static void set_refuse_options(char *bp)
{
struct poptOption *op;
- char *cp;
+ char *cp, shortname[2];
+ int is_wild;
+
+ shortname[1] = '\0';
while (1) {
+ while (*bp == ' ') bp++;
+ if (!*bp)
+ break;
if ((cp = strchr(bp, ' ')) != NULL)
*cp= '\0';
+ /* If they specify "delete", reject all delete options. */
+ if (strcmp(bp, "delete") == 0)
+ bp = "delete*";
+ is_wild = strpbrk(bp, "*?[") != NULL;
for (op = long_options; ; op++) {
if (!op->longName) {
rprintf(FLOG,
- "Unknown option %s in \"refuse options\" setting\n",
+ "No match for refuse-options string \"%s\"\n",
bp);
break;
}
- if (strcmp(bp, op->longName) == 0) {
- op->val = (op - long_options)+OPT_REFUSED_BASE;
- break;
+ *shortname = op->shortName;
+ if (wildmatch(bp, op->longName) || wildmatch(bp, shortname)) {
+ op->val = (op - long_options) + OPT_REFUSED_BASE;
+ if (!is_wild)
+ break;
}
}
if (!cp)
}
#endif
- if (block_size > MAX_MAP_SIZE) {
- rprintf(FINFO, "limiting block-size to %d bytes\n",
- MAX_MAP_SIZE);
- block_size = MAX_MAP_SIZE;
- }
-
if (write_batch && read_batch) {
- rprintf(FERROR,
+ snprintf(err_buf, sizeof err_buf,
"--write-batch and --read-batch can not be used together\n");
- exit_cleanup(RERR_SYNTAX);
+ return 0;
}
if (write_batch || read_batch) {
if (dry_run) {
- rprintf(FERROR,
+ snprintf(err_buf, sizeof err_buf,
"--%s-batch cannot be used with --dry_run (-n)\n",
write_batch ? "write" : "read");
- exit_cleanup(RERR_SYNTAX);
+ return 0;
}
if (am_server) {
rprintf(FINFO,
}
}
if (read_batch && files_from) {
- rprintf(FERROR,
+ snprintf(err_buf, sizeof err_buf,
"--read-batch cannot be used with --files-from\n");
- exit_cleanup(RERR_SYNTAX);
+ return 0;
}
if (batch_name && strlen(batch_name) > MAX_BATCH_NAME_LEN) {
- rprintf(FERROR,
+ snprintf(err_buf, sizeof err_buf,
"the batch-file name must be %d characters or less.\n",
MAX_BATCH_NAME_LEN);
- exit_cleanup(RERR_SYNTAX);
+ return 0;
}
if (tmpdir && strlen(tmpdir) >= MAXPATHLEN - 10) {
- rprintf(FERROR, "the --temp-dir path is WAY too long.\n");
- exit_cleanup(RERR_SYNTAX);
+ snprintf(err_buf, sizeof err_buf,
+ "the --temp-dir path is WAY too long.\n");
+ return 0;
}
if (archive_mode) {
if (files_from)
files_from = alloc_sanitize_path(files_from, curr_dir);
}
+ if (server_exclude_list.head && !am_sender) {
+ struct exclude_list_struct *elp = &server_exclude_list;
+ if (tmpdir) {
+ clean_fname(tmpdir);
+ if (check_exclude(elp, tmpdir, 1) < 0)
+ goto options_rejected;
+ }
+ if (partial_dir) {
+ clean_fname(partial_dir);
+ if (check_exclude(elp, partial_dir, 1) < 0)
+ goto options_rejected;
+ }
+ if (compare_dest) {
+ clean_fname(compare_dest);
+ if (check_exclude(elp, compare_dest, 1) < 0)
+ goto options_rejected;
+ }
+ if (backup_dir) {
+ clean_fname(backup_dir);
+ if (check_exclude(elp, backup_dir, 1) < 0)
+ goto options_rejected;
+ }
+ }
+ if (server_exclude_list.head && files_from) {
+ clean_fname(files_from);
+ if (check_exclude(&server_exclude_list, files_from, 0) < 0) {
+ options_rejected:
+ snprintf(err_buf, sizeof err_buf,
+ "Your options have been rejected by the server.\n");
+ return 0;
+ }
+ }
if (daemon_opt) {
daemon_opt = 0;
backup_suffix = backup_dir ? "" : BACKUP_SUFFIX;
backup_suffix_len = strlen(backup_suffix);
if (strchr(backup_suffix, '/') != NULL) {
- rprintf(FERROR, "--suffix cannot contain slashes: %s\n",
+ snprintf(err_buf, sizeof err_buf,
+ "--suffix cannot contain slashes: %s\n",
backup_suffix);
- exit_cleanup(RERR_SYNTAX);
+ return 0;
}
if (backup_dir) {
backup_dir_len = strlcpy(backup_dir_buf, backup_dir, sizeof backup_dir_buf);
backup_dir_remainder = sizeof backup_dir_buf - backup_dir_len;
if (backup_dir_remainder < 32) {
- rprintf(FERROR, "the --backup-dir path is WAY too long.\n");
- exit_cleanup(RERR_SYNTAX);
+ snprintf(err_buf, sizeof err_buf,
+ "the --backup-dir path is WAY too long.\n");
+ return 0;
}
if (backup_dir_buf[backup_dir_len - 1] != '/') {
backup_dir_buf[backup_dir_len++] = '/';
if (verbose > 1 && !am_sender)
rprintf(FINFO, "backup_dir is %s\n", backup_dir_buf);
} else if (!backup_suffix_len && (!am_server || !am_sender)) {
- rprintf(FERROR,
+ snprintf(err_buf, sizeof err_buf,
"--suffix cannot be a null string without --backup-dir\n");
- exit_cleanup(RERR_SYNTAX);
+ return 0;
}
if (do_progress && !verbose)
if (files_from) {
char *colon;
- if (*argc != 2 && !(am_server && am_sender && *argc == 1)) {
+ if (*argc > 2 || (!am_daemon && *argc == 1)) {
usage(FERROR);
exit_cleanup(RERR_SYNTAX);
}
}
remote_filesfrom_file = colon+1 + (colon[1] == ':');
if (strcmp(remote_filesfrom_file, "-") == 0) {
- rprintf(FERROR, "Invalid --files-from remote filename\n");
- exit_cleanup(RERR_SYNTAX);
+ snprintf(err_buf, sizeof err_buf,
+ "Invalid --files-from remote filename\n");
+ return 0;
}
} else {
filesfrom_fd = open(files_from, O_RDONLY|O_BINARY);
if (filesfrom_fd < 0) {
- rsyserr(FERROR, errno,
- "failed to open files-from file %s",
- files_from);
- exit_cleanup(RERR_FILEIO);
+ snprintf(err_buf, sizeof err_buf,
+ "failed to open files-from file %s: %s\n",
+ files_from, strerror(errno));
+ return 0;
}
}
}
args[ac++] = arg;
}
- if (delete_excluded)
- args[ac++] = "--delete-excluded";
- else if (delete_mode)
- args[ac++] = "--delete";
+ if (am_sender) {
+ if (delete_excluded)
+ args[ac++] = "--delete-excluded";
+ else if (delete_mode
+ && (!delete_after || protocol_version < 27))
+ args[ac++] = "--delete";
+
+ if (delete_after)
+ args[ac++] = "--delete-after";
+
+ if (force_delete)
+ args[ac++] = "--force";
+ }
if (size_only)
args[ac++] = "--size-only";
} else if (keep_partial)
args[ac++] = "--partial";
- if (force_delete)
- args[ac++] = "--force";
-
- if (delete_after)
- args[ac++] = "--delete-after";
-
if (ignore_errors)
args[ac++] = "--ignore-errors";
Matt McCutchen's Web Site / rsync / rsync.git / blobdiff