Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- fix writev1() to pre-decrement count. 

- always open ttys with O_NDELAY.
This commit is contained in:
christos 2012-06-19 13:44:35 +00:00
parent cb2c856119
commit 0787d10414
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
usr.sbin/syslogd/syslogd.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: syslogd.c,v 1.110 2012/06/18 19:17:42 christos Exp $ */ /* $NetBSD: syslogd.c,v 1.111 2012/06/19 13:44:35 christos Exp $ */
/* /*
* Copyright (c) 1983, 1988, 1993, 1994 * Copyright (c) 1983, 1988, 1993, 1994
@ -39,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1983, 1988, 1993, 1994\
#if 0 #if 0
static char sccsid[] = "@(#)syslogd.c 8.3 (Berkeley) 4/4/94"; static char sccsid[] = "@(#)syslogd.c 8.3 (Berkeley) 4/4/94";
#else #else
__RCSID("$NetBSD: syslogd.c,v 1.110 2012/06/18 19:17:42 christos Exp $"); __RCSID("$NetBSD: syslogd.c,v 1.111 2012/06/19 13:44:35 christos Exp $");
#endif #endif
#endif /* not lint */ #endif /* not lint */
@ -2422,7 +2422,7 @@ fprintlog(struct filed *f, struct buf_msg *passedbuffer, struct buf_queue *qentr
*/ */
if ((e == EIO || e == EBADF) && f->f_type != F_FILE) { if ((e == EIO || e == EBADF) && f->f_type != F_FILE) {
f->f_file = open(f->f_un.f_fname, f->f_file = open(f->f_un.f_fname,
O_WRONLY|O_APPEND|O_NDELAY, 0); O_WRONLY|O_APPEND|O_NDELAY|O_NONBLOCK, 0);
if (f->f_file < 0) { if (f->f_file < 0) {
f->f_type = F_UNUSED; f->f_type = F_UNUSED;
logerror("%s", f->f_un.f_fname); logerror("%s", f->f_un.f_fname);
@ -3822,7 +3822,7 @@ cfline(size_t linenum, const char *line, struct filed *f, const char *prog,
f->f_flags |= FFLAG_SIGN; f->f_flags |= FFLAG_SIGN;
#endif /* !DISABLE_SIGN */ #endif /* !DISABLE_SIGN */
(void)strlcpy(f->f_un.f_fname, p, sizeof(f->f_un.f_fname)); (void)strlcpy(f->f_un.f_fname, p, sizeof(f->f_un.f_fname));
if ((f->f_file = open(p, O_WRONLY|O_APPEND, 0)) < 0) { if ((f->f_file = open(p, O_WRONLY|O_APPEND|O_NDELAY, 0)) < 0) {
f->f_type = F_UNUSED; f->f_type = F_UNUSED;
logerror("%s", p); logerror("%s", p);
break; break;
@ -4708,6 +4708,8 @@ writev1(int fd, struct iovec *iov, size_t count)
ssize_t nw = 0, tot = 0; ssize_t nw = 0, tot = 0;
size_t ntries = 5; size_t ntries = 5;
if (count == 0)
return 0;
while (ntries--) { while (ntries--) {
switch ((nw = writev(fd, iov, count))) { switch ((nw = writev(fd, iov, count))) {
case -1: case -1:
@ -4718,8 +4720,8 @@ writev1(int fd, struct iovec *iov, size_t count)
pfd.revents = 0; pfd.revents = 0;
(void)poll(&pfd, 1, 500); (void)poll(&pfd, 1, 500);
continue; continue;
} else }
return -1; return -1;
case 0: case 0:
return 0; return 0;
default: default:
@ -4727,10 +4729,11 @@ writev1(int fd, struct iovec *iov, size_t count)
while (nw > 0) { while (nw > 0) {
if (iov->iov_len > (size_t)nw) { if (iov->iov_len > (size_t)nw) {
iov->iov_len -= nw; iov->iov_len -= nw;
iov->iov_base = (char *)iov->iov_base + nw; iov->iov_base =
(char *)iov->iov_base + nw;
break; break;
} else { } else {
if (count-- == 0) if (--count == 0)
return tot; return tot;
nw -= iov->iov_len; nw -= iov->iov_len;
iov++; iov++;