{ RERR_MALLOC , "error allocating core memory buffers" },
{ RERR_PARTIAL , "some files/attrs were not transferred (see previous errors)" },
{ RERR_VANISHED , "some files vanished before they could be transferred" },
+ { RERR_DEL_LIMIT , "the --max-delete limit stopped deletions" },
{ RERR_TIMEOUT , "timeout in data send/receive" },
{ RERR_CONTIMEOUT , "timeout waiting for daemon connection" },
{ RERR_CMD_FAILED , "remote shell failed" },
{ RERR_CMD_KILLED , "remote shell killed" },
{ RERR_CMD_RUN , "remote command could not be run" },
{ RERR_CMD_NOTFOUND,"remote command not found" },
- { RERR_DEL_LIMIT , "the --max-delete limit stopped deletions" },
{ 0, NULL }
};
if (len < 0)
exit_cleanup(RERR_MESSAGEIO);
- if (msgs2stderr && code != FLOG)
- goto output_msg;
-
- if (send_msgs_to_gen) {
+ if (msgs2stderr) {
+ if (!am_daemon) {
+ if (code == FLOG)
+ return;
+ goto output_msg;
+ }
+ if (code == FCLIENT)
+ return;
+ code = FLOG;
+ } else if (send_msgs_to_gen) {
assert(!is_utf8);
/* Pass the message to our sibling in native charset. */
send_msg((enum msgcode)code, buf, len, 0);
case FCLIENT:
break;
default:
- fprintf(stderr, "Unknown logcode in rwrite(): %d\n", (int)code);
+ fprintf(stderr, "Unknown logcode in rwrite(): %d [%s]\n", (int)code, who_am_i());
exit_cleanup(RERR_MESSAGEIO);
}
return 0;
for (p = format; (p = strchr(p, '%')) != NULL; ) {
- for (p++; *p == '\''; p++) {}
+ for (p++; *p == '\''; p++) {} /*SHARED ITERATOR*/
if (*p == '-')
p++;
while (isDigit(p))
static struct {
union file_extras ex[4]; /* just in case... */
struct file_struct file;
- } x;
+ } x; /* Zero-initialized due to static declaration. */
int len = strlen(fname);
const char *fmt;