mi = mallinfo();
- rprintf(FINFO, RSYNC_NAME "[%d] (%s%s%s) heap statistics:\n",
+ rprintf(FINFO, "\n" RSYNC_NAME "[%d] (%s%s%s) heap statistics:\n",
getpid(),
am_server ? "server " : "",
am_daemon ? "daemon " : "",
extern int read_batch;
if (!read_batch && !local_server) {
+ char *rsh_env = getenv(RSYNC_RSH_ENV);
if (!cmd)
- cmd = getenv(RSYNC_RSH_ENV);
+ cmd = rsh_env;
if (!cmd)
cmd = RSYNC_RSH;
cmd = strdup(cmd);
}
/* check to see if we've already been given '-l user' in
- the remote-shell command */
+ * the remote-shell command */
for (i = 0; i < argc-1; i++) {
if (!strcmp(args[i], "-l") && args[i+1][0] != '-')
dash_l_set = 1;
args[argc++] = rsync_path;
- if ((blocking_io == -1) && (strcmp(cmd, RSYNC_RSH) == 0))
- blocking_io = 1;
+ if (blocking_io < 0) {
+ char *cp;
+ if ((cp = strrchr(cmd, '/')) != NULL)
+ cp++;
+ else
+ cp = cmd;
+ if (strcmp(cp, "rsh") == 0 || strcmp(cp, "remsh") == 0)
+ blocking_io = 1;
+ }
server_options(args,&argc);
-
}
args[argc++] = ".";
exit_cleanup(0);
}
+ io_start_buffering_in(f_in);
+ io_start_buffering_out(f_out);
send_files(flist,f_out,f_in);
io_flush();
report(f_out);
if (protocol_version >= 24) {
/* final goodbye message */
- read_int(f_in);
- }
+ read_int(f_in);
+ }
io_flush();
exit_cleanup(0);
}
close(recv_pipe[1]);
io_flush();
/* finally we go to sleep until our parent kills us
- with a USR2 signal. We sleep for a short time as on
- some OSes a signal won't interrupt a sleep! */
+ * with a USR2 signal. We sleep for a short time as on
+ * some OSes a signal won't interrupt a sleep! */
while (msleep(20))
;
}
close(error_pipe[1]);
if (f_in != f_out) close(f_in);
- io_start_buffering(f_out);
+ io_start_buffering_out(f_out);
io_set_error_fd(error_pipe[0]);
}
}
+ io_start_buffering_in(f_in);
if (delete_mode && !delete_excluded)
recv_exclude_list(f_in);
extern int cvs_exclude;
extern int delete_mode;
extern int delete_excluded;
+ io_start_buffering_out(f_out);
if (cvs_exclude)
add_cvs_excludes();
if (delete_mode && !delete_excluded)
send_exclude_list(f_out);
if (remote_filesfrom_file)
filesfrom_fd = f_in;
- if (!read_batch) /* dw -- don't write to pipe */
+ if (!read_batch) /* don't write to pipe */
flist = send_file_list(f_out,argc,argv);
if (verbose > 3)
rprintf(FINFO,"file list sent\n");
+ io_flush();
+ io_start_buffering_out(f_out);
send_files(flist,f_out,f_in);
+ io_flush();
if (protocol_version >= 24) {
/* final goodbye message */
read_int(f_in);
wait_process(pid, &status);
}
report(-1);
+ io_flush();
exit_cleanup(status);
}
&f_in,&f_out);
/* if we're running an rsync server on the remote host over a
- remote shell command, we need to do the RSYNCD protocol first */
+ * remote shell command, we need to do the RSYNCD protocol first */
if (daemon_over_rsh) {
int tmpret;
tmpret = start_inband_exchange(shell_user, shell_path,
* zombie children, maybe that's why he did it.
*/
while ((pid = waitpid(-1, &status, WNOHANG)) > 0) {
- /* save the child's exit status */
- for (cnt = 0; cnt < MAXCHILDPROCS; cnt++) {
- if (pid_stat_table[cnt].pid == 0) {
- pid_stat_table[cnt].pid = pid;
- pid_stat_table[cnt].status = status;
- break;
- }
- }
+ /* save the child's exit status */
+ for (cnt = 0; cnt < MAXCHILDPROCS; cnt++) {
+ if (pid_stat_table[cnt].pid == 0) {
+ pid_stat_table[cnt].pid = pid;
+ pid_stat_table[cnt].status = status;
+ break;
+ }
+ }
}
#endif
}
}
/* we set a 0 umask so that correct file permissions can be
- carried across */
+ * carried across */
orig_umask = (int)umask(0);
if (!parse_arguments(&argc, (const char ***) &argv, 1)) {
signal(SIGPIPE, SIG_IGN);
/* Initialize push_dir here because on some old systems getcwd
- (implemented by forking "pwd" and reading its output) doesn't
- work when there are other child processes. Also, on all systems
- that implement getcwd that way "pwd" can't be found after chroot. */
+ * (implemented by forking "pwd" and reading its output) doesn't
+ * work when there are other child processes. Also, on all systems
+ * that implement getcwd that way "pwd" can't be found after chroot. */
push_dir(NULL,0);
if (write_batch && !am_server) {