if (saw_d) {
rprintf(FWARNING,
- "*** Try adding \"-r --exclude='/*/*'\" "
- "if remote rsync is <= 2.6.3 ***\n");
+ "*** Try using \"--old-d\" if remote rsync is <= 2.6.3 ***\n");
}
}
return s - buf;
}
-int read_args(int f_in, char *mod_name, char *buf, size_t bufsiz, int rl_nulls,
- char ***argv_p, int *argc_p, char **request_p)
+void read_args(int f_in, char *mod_name, char *buf, size_t bufsiz, int rl_nulls,
+ char ***argv_p, int *argc_p, char **request_p)
{
int maxargs = MAX_ARGS;
int dot_pos = 0;
if (!(argv = new_array(char *, maxargs)))
out_of_memory("read_args");
- if (mod_name)
+ if (mod_name && !protect_args)
argv[argc++] = "rsyncd";
while (1) {
if (read_line(f_in, buf, bufsiz, rl_flags) == 0)
break;
- if (argc == maxargs) {
+ if (argc == maxargs-1) {
maxargs += MAX_ARGS;
if (!(argv = realloc_array(argv, char *, maxargs)))
out_of_memory("read_args");
dot_pos = argc;
}
}
+ argv[argc] = NULL;
+
+ glob_expand(NULL, NULL, NULL, NULL);
*argc_p = argc;
*argv_p = argv;
-
- return dot_pos ? dot_pos : argc;
}
int io_start_buffering_out(int f_out)