From: Jeremy Harris Date: Fri, 23 Nov 2012 01:33:31 +0000 (+0000) Subject: Fix merge problem. X-Git-Tag: exim-4_81_RC1~3^2~36 X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=ae96393855f6ea395a53a1767cc049d1f6ae9683;p=exim.git Fix merge problem. --- diff --git a/src/src/queue.c b/src/src/queue.c index ff0ae67e5..8876e09be 100644 --- a/src/src/queue.c +++ b/src/src/queue.c @@ -650,7 +650,7 @@ for (i = (queue_run_in_order? -1 : 0); the mere fact that read() unblocks is enough. */ set_process_info("running queue: waiting for children of %d", pid); - if (read(pfd[pipe_read], buffer, sizeof(buffer)) >= 0) + if (read(pfd[pipe_read], buffer, sizeof(buffer)) > 0) log_write(0, LOG_MAIN|LOG_PANIC, "queue run: unexpected data on pipe"); (void)close(pfd[pipe_read]); set_process_info("running queue");