* remember_children(), we succeed instead of returning an error. */
pid_t wait_process(pid_t pid, int *status_ptr, int flags)
{
- pid_t waited_pid = waitpid(pid, status_ptr, flags);
+ pid_t waited_pid;
+
+ do {
+ waited_pid = waitpid(pid, status_ptr, flags);
+ } while (waited_pid == -1 && errno == EINTR);
if (waited_pid == -1 && errno == ECHILD) {
/* Status of requested child no longer available: check to
human_num(stats.literal_data));
rprintf(FINFO,"Matched data: %s bytes\n",
human_num(stats.matched_data));
- rprintf(FINFO,"File list size: %d\n", stats.flist_size);
+ rprintf(FINFO,"File list size: %s\n",
+ human_num(stats.flist_size));
if (stats.flist_buildtime) {
rprintf(FINFO,
"File list generation time: %.3f seconds\n",
}
}
- if (i != -1) {
+ if (i != NDX_DONE) {
rprintf(FERROR, "Invalid packet at end of run (%d) [%s]\n",
i, who_am_i());
exit_cleanup(RERR_PROTOCOL);
}
}
-
static void do_server_sender(int f_in, int f_out, int argc, char *argv[])
{
struct file_list *flist;
}
flist = send_file_list(f_out,argc,argv);
- if (!flist || flist->count == 0) {
+ if (!flist || flist->count == 0)
exit_cleanup(0);
- }
the_file_list = flist;
io_start_buffering_in();
* points to an identical file won't be replaced by the referent. */
copy_links = copy_dirlinks = 0;
+#ifdef SUPPORT_HARD_LINKS
if (preserve_hard_links)
- init_hard_links();
+ match_hard_links();
+#endif
if (fd_pair(error_pipe) < 0) {
rsyserr(FERROR, errno, "pipe failed in do_recv");
io_flush(FULL_FLUSH);
if (protocol_version >= 24) {
/* send a final goodbye message */
- write_int(f_out, -1);
+ write_int(f_out, NDX_DONE);
}
io_flush(FULL_FLUSH);
return exit_code;
}
-
static void do_server_recv(int f_in, int f_out, int argc,char *argv[])
{
int exit_code;
keep_dirlinks = 0; /* Must be disabled on the sender. */
if (need_messages_from_generator)
io_start_multiplex_in();
-
recv_filter_list(f_in);
do_server_sender(f_in, f_out, argc, argv);
- } else {
+ } else
do_server_recv(f_in, f_out, argc, argv);
- }
exit_cleanup(0);
}
return MAX(exit_code, exit_code2);
}
-static int copy_argv (char *argv[])
+static int copy_argv(char *argv[])
{
int i;
char cmd_buf[300];
int ret;
- sprintf(cmd_buf, get_panic_action(),
- getpid(), getpid());
+ snprintf(cmd_buf, sizeof cmd_buf, get_panic_action(),
+ getpid(), getpid());
/* Unless we failed to execute gdb, we allow the process to
* continue. I'm not sure if that's right. */