extern int log_got_error;
extern int module_id;
extern int orig_umask;
+extern int keep_dirlinks;
extern int preserve_hard_links;
extern int protocol_version;
extern int recurse;
extern int relative_paths;
extern int rsync_port;
+extern int whole_file;
extern int read_batch;
extern int write_batch;
extern int filesfrom_fd;
io_flush(FULL_FLUSH);
}
- if ((waited_pid == -1) && (errno == ECHILD)) {
+ if (waited_pid == -1 && errno == ECHILD) {
/* status of requested child no longer available.
* check to see if it was processed by the sigchld_handler.
*/
if (am_daemon) {
log_exit(0, __FILE__, __LINE__);
- if (f == -1 || !am_sender) return;
+ if (f == -1 || !am_sender)
+ return;
}
if (am_server) {
int *f_in, int *f_out)
{
int i, argc = 0;
- char *args[100];
+ char *args[MAX_ARGS];
pid_t ret;
char *tok, *dir = NULL;
int dash_l_set = 0;
if (!cmd)
goto oom;
- for (tok = strtok(cmd, " "); tok; tok = strtok(NULL, " "))
+ for (tok = strtok(cmd, " "); tok; tok = strtok(NULL, " ")) {
+ /* Comparison leaves rooms for server_options(). */
+ if (argc >= MAX_ARGS - 100) {
+ rprintf(FERROR, "internal: args[] overflowed in do_cmd()\n");
+ exit_cleanup(RERR_SYNTAX);
+ }
args[argc++] = tok;
+ }
/* check to see if we've already been given '-l user' in
* the remote-shell command */
}
server_options(args,&argc);
+
+ if (argc >= MAX_ARGS - 2) {
+ rprintf(FERROR, "internal: args[] overflowed in do_cmd()\n");
+ exit_cleanup(RERR_SYNTAX);
+ }
}
args[argc++] = ".";
if (!daemon_over_rsh && path && *path)
args[argc++] = path;
- if (argc >= (int)(sizeof args / sizeof args[0])) {
- rprintf(FERROR, "internal: args[] overflowed in do_cmd()\n");
- exit_cleanup(RERR_MALLOC); /* XXX Need better RERR? */
- }
-
args[argc] = NULL;
if (verbose > 3) {
rprintf(FINFO,"cmd=");
- for (i=0;i<argc;i++)
+ for (i = 0; i < argc; i++)
rprintf(FINFO,"%s ",args[i]);
rprintf(FINFO,"\n");
}
if (local_server) {
if (read_batch)
create_flist_from_batch(); /* sets batch_flist */
+ /* If the user didn't request --[no-]whole-file, force
+ * it on, but only if we're not batch processing. */
+ if (whole_file < 0 && !read_batch && !write_batch)
+ whole_file = 1;
ret = local_child(argc, args, f_in, f_out, child_main);
} else {
ret = piped_child(args,f_in,f_out);
}
- if (dir) free(dir);
+ if (dir)
+ free(dir);
return ret;
if (do_stat(name,&st) == 0) {
if (S_ISDIR(st.st_mode)) {
if (!push_dir(name)) {
- rprintf(FERROR, "push_dir %s failed: %s (1)\n",
- full_fname(name), strerror(errno));
+ rsyserr(FERROR, errno, "push_dir#1 %s failed",
+ full_fname(name));
exit_cleanup(RERR_FILESELECT);
}
return NULL;
return name;
if (do_mkdir(name,0777 & ~orig_umask) != 0) {
- rprintf(FERROR, "mkdir %s failed: %s\n",
- full_fname(name), strerror(errno));
+ rsyserr(FERROR, errno, "mkdir %s failed", full_fname(name));
exit_cleanup(RERR_FILEIO);
} else {
if (verbose > 0)
}
if (!push_dir(name)) {
- rprintf(FERROR, "push_dir %s failed: %s (2)\n",
- full_fname(name), strerror(errno));
+ rsyserr(FERROR, errno, "push_dir#2 %s failed",
+ full_fname(name));
exit_cleanup(RERR_FILESELECT);
}
(long)getpid());
}
+ if (am_daemon && lp_write_only(module_id) && am_sender) {
+ rprintf(FERROR, "ERROR: module is write only\n");
+ exit_cleanup(RERR_SYNTAX);
+ return;
+ }
+
if (!relative_paths && !push_dir(dir)) {
- rprintf(FERROR, "push_dir %s failed: %s (3)\n",
- full_fname(dir), strerror(errno));
+ rsyserr(FERROR, errno, "push_dir#3 %s failed",
+ full_fname(dir));
exit_cleanup(RERR_FILESELECT);
}
argc--;
int l = strlen(dir);
if (strcmp(dir,"/") == 0)
l = 0;
- for (i=0;i<argc;i++)
+ for (i = 0; i < argc; i++)
argv[i] += l+1;
}
if (argc == 0 && recurse) {
- argc=1;
+ argc = 1;
argv--;
argv[0] = ".";
}
static int do_recv(int f_in,int f_out,struct file_list *flist,char *local_name)
{
int pid;
- int status=0;
+ int status = 0;
int error_pipe[2];
if (preserve_hard_links)
io_flush(NORMAL_FLUSH);
- if ((pid=do_fork()) == 0) {
+ if ((pid = do_fork()) == 0) {
close(error_pipe[0]);
- if (f_in != f_out) close(f_out);
+ if (f_in != f_out)
+ close(f_out);
/* we can't let two processes write to the socket at one time */
io_multiplexing_close();
am_generator = 1;
close(error_pipe[1]);
- if (f_in != f_out) close(f_in);
+ if (f_in != f_out)
+ close(f_in);
io_start_buffering_out(f_out);
argc--;
argv++;
if (!am_daemon && !push_dir(dir)) {
- rprintf(FERROR, "push_dir %s failed: %s (4)\n",
- full_fname(dir), strerror(errno));
+ rsyserr(FERROR, errno, "push_dir#4 %s failed",
+ full_fname(dir));
exit_cleanup(RERR_FILESELECT);
}
}
if (argc > 0) {
if (strcmp(dir,".")) {
argv[0] += strlen(dir);
- if (argv[0][0] == '/') argv[0]++;
+ if (argv[0][0] == '/')
+ argv[0]++;
}
local_name = get_local_name(flist,argv[0]);
}
io_start_multiplex_out(f_out);
if (am_sender) {
+ keep_dirlinks = 0; /* Must be disabled on the sender. */
if (!read_batch) {
recv_exclude_list(f_in);
if (cvs_exclude)
io_start_multiplex_in(f_in);
if (am_sender) {
+ keep_dirlinks = 0; /* Must be disabled on the sender. */
io_start_buffering_out(f_out);
if (cvs_exclude)
add_cvs_excludes();
exit_cleanup(status);
}
- if (argc == 0) {
+ if (argc == 0)
list_only = 1;
- }
- if (!write_batch)
+ if (!read_batch)
send_exclude_list(f_out);
if (filesfrom_fd >= 0) {
return start_socket_client(host, path, argc-1, argv+1);
}
- if (!read_batch) {
+ if (!read_batch) { /* for read_batch, NO source is specified */
p = find_colon(argv[0]);
- if (p) {
+ if (p) { /* source is remote */
if (remote_filesfrom_file
&& remote_filesfrom_file != files_from + 1
&& strncmp(files_from, argv[0], p-argv[0]+1) != 0) {
daemon_over_rsh = 1;
}
- if (argc < 1) {
+ if (argc < 1) { /* destination required */
usage(FERROR);
exit_cleanup(RERR_SYNTAX);
}
*p = 0;
shell_machine = argv[0];
shell_path = p+1;
- argc--;
argv++;
- } else {
+ } else { /* source is local */
am_sender = 1;
/* rsync:// destination uses rsync server over direct socket */
return start_socket_client(host, path, argc-1, argv);
}
- p = find_colon(argv[argc-1]);
+ p = find_colon(argv[argc-1]); /* look in dest arg */
if (p && remote_filesfrom_file
&& remote_filesfrom_file != files_from + 1
&& strncmp(files_from, argv[argc-1], p-argv[argc-1]+1) != 0) {
"--files-from hostname is not transfer hostname\n");
exit_cleanup(RERR_SYNTAX);
}
- if (!p) {
+ if (!p) { /* no colon found, so src & dest are local */
local_server = 1;
if (remote_filesfrom_file) {
rprintf(FERROR,
shell_machine = argv[argc-1];
shell_path = p+1;
}
- argc--;
}
- } else {
+ argc--;
+ } else { /* read_batch */
am_sender = 1;
local_server = 1;
shell_path = argv[argc-1];
shell_path?shell_path:"");
}
+ /* for remote source, only single dest arg can remain ... */
if (!am_sender && argc > 1) {
usage(FERROR);
exit_cleanup(RERR_SYNTAX);
}
- if (argc == 0 && !am_sender) {
+ /* ... or no dest at all */
+ if (!am_sender && argc == 0) {
list_only = 1;
}