The branch, master has been updated via d80f7d6 Add a colon if a non-empty pre-xfer exec message follows. from e3bc529 Handle EINTR when reading the pre-xfer exec message.
;a=shortlog;h=master - Log ----------------------------------------------------------------- commit d80f7d6cc30764be74e5eb48259344ef868e38b7 Author: Wayne Davison <way...@samba.org> Date: Sat Jun 4 12:12:25 2011 -0700 Add a colon if a non-empty pre-xfer exec message follows. ----------------------------------------------------------------------- Summary of changes: clientserver.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) Changeset truncated at 500 lines: diff --git a/clientserver.c b/clientserver.c index 91612ea..fbd3af6 100644 --- a/clientserver.c +++ b/clientserver.c @@ -396,9 +396,10 @@ static char *finish_pre_exec(pid_t pid, int write_fd, int read_fd, char *request if (wait_process(pid, &status, 0) < 0 || !WIFEXITED(status) || WEXITSTATUS(status) != 0) { char *e; - if (asprintf(&e, "pre-xfer exec returned failure (%d)%s%s\n%s", + if (asprintf(&e, "pre-xfer exec returned failure (%d)%s%s%s\n%s", status, status < 0 ? ": " : "", - status < 0 ? strerror(errno) : "", buf) < 0) + status < 0 ? strerror(errno) : "", + *buf ? ":" : "", buf) < 0) return "out_of_memory in finish_pre_exec\n"; return e; } -- The rsync repository. _______________________________________________ rsync-cvs mailing list rsync-cvs@lists.samba.org https://lists.samba.org/mailman/listinfo/rsync-cvs