diff options
| author | Denis Vlasenko | 2007-10-11 10:10:15 +0000 |
|---|---|---|
| committer | Denis Vlasenko | 2007-10-11 10:10:15 +0000 |
| commit | 4f95e5aab8d6a2d827d3fe937cf2c72229f6955e (patch) | |
| tree | 3985763ee17b6bb2a75c0143f61dc21f1384cf02 /sysklogd/syslogd.c | |
| parent | f9566d8c29a820e94f194a9ac303c912899e6c8a (diff) | |
| download | busybox-4f95e5aab8d6a2d827d3fe937cf2c72229f6955e.zip busybox-4f95e5aab8d6a2d827d3fe937cf2c72229f6955e.tar.gz | |
vi: don't wait 50 ms before reading ESC sequences
inetd,syslogd: use safe_read instead of open-coded EINTR handling
syslogd: bail out if you see null read from Unix socket
(should never happen, but if it does, spinning forever
and eating 100% CPU is not a good idea)
Diffstat (limited to 'sysklogd/syslogd.c')
| -rw-r--r-- | sysklogd/syslogd.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/sysklogd/syslogd.c b/sysklogd/syslogd.c index 284e574..ba46792 100644 --- a/sysklogd/syslogd.c +++ b/sysklogd/syslogd.c @@ -527,12 +527,10 @@ static void do_syslogd(void) for (;;) { size_t sz; - sz = read(sock_fd, G.recvbuf, MAX_READ - 1); + sz = safe_read(sock_fd, G.recvbuf, MAX_READ - 1); if (sz <= 0) { - if (sz == 0) - continue; /* EOF from unix socket??? */ - if (errno == EINTR) /* alarm may have happened */ - continue; + //if (sz == 0) + // continue; /* EOF from unix socket??? */ bb_perror_msg_and_die("read from /dev/log"); } |