X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/d48810ba5b0b8d09b272092a70da1255c2346ab8..fd2598022cc10ce4f28019f5c0cb1816cd9311a4:/main.c diff --git a/main.c b/main.c index 5985f808..d9a6c818 100644 --- a/main.c +++ b/main.c @@ -508,8 +508,8 @@ static char *get_local_name(struct file_list *flist, char *dest_path) return NULL; if (daemon_filter_list.head - && (check_filter(&daemon_filter_list, dest_path, 0 != 0) < 0 - || check_filter(&daemon_filter_list, dest_path, 1 != 0) < 0)) { + && (check_filter(&daemon_filter_list, FLOG, dest_path, 0 != 0) < 0 + || check_filter(&daemon_filter_list, FLOG, dest_path, 1 != 0) < 0)) { rprintf(FERROR, "skipping daemon-excluded destination \"%s\"\n", dest_path); exit_cleanup(RERR_FILESELECT); @@ -916,11 +916,11 @@ static void do_server_recv(int f_in, int f_out, int argc, char *argv[]) char *dir = *dir_p; if (*dir == '/') dir += module_dirlen; - if (check_filter(elp, dir, 1) < 0) + if (check_filter(elp, FLOG, dir, 1) < 0) goto options_rejected; } if (partial_dir && *partial_dir == '/' - && check_filter(elp, partial_dir + module_dirlen, 1) < 0) { + && check_filter(elp, FLOG, partial_dir + module_dirlen, 1) < 0) { options_rejected: rprintf(FERROR, "Your options have been rejected by the server.\n"); @@ -1038,11 +1038,6 @@ int client_run(int f_in, int f_out, pid_t pid, int argc, char *argv[]) io_start_multiplex_out(); } - if (argc == 0) { - list_only |= 1; - xfer_dirs |= 1; - } - send_filter_list(read_batch ? -1 : f_out); if (filesfrom_fd >= 0) { @@ -1153,8 +1148,6 @@ static int start_client(int argc, char *argv[]) static char *dotarg[1] = { "." }; p = dotarg[0]; remote_argv = dotarg; - list_only |= 1; - xfer_dirs |= 1; } remote_argc = 1; @@ -1226,10 +1219,6 @@ static int start_client(int argc, char *argv[]) } remote_argv[i] = arg; } - if (argc == 0) { - list_only |= 1; - xfer_dirs |= 1; - } } if (daemon_over_rsh < 0)