diff options
| author | Henning Brauer <henning@cvs.openbsd.org> | 2003-12-24 13:28:03 +0000 |
|---|---|---|
| committer | Henning Brauer <henning@cvs.openbsd.org> | 2003-12-24 13:28:03 +0000 |
| commit | b9f919ad8e4bd53a01b04a664c619a8833fe4eea (patch) | |
| tree | baf977705fd3ead7ef8d3c29bd377d9e0dd5dad4 /usr.sbin/bgpd/bgpd.c | |
| parent | f924fc5687fcce16de3cbe026d2266242ff50a73 (diff) | |
handle write() returning 0 correctly, adjust the msgbuf API appropriately,
and make all callers cope.
Diffstat (limited to 'usr.sbin/bgpd/bgpd.c')
| -rw-r--r-- | usr.sbin/bgpd/bgpd.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/usr.sbin/bgpd/bgpd.c b/usr.sbin/bgpd/bgpd.c index 346f94cc78a..c725ce9b971 100644 --- a/usr.sbin/bgpd/bgpd.c +++ b/usr.sbin/bgpd/bgpd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bgpd.c,v 1.21 2003/12/23 19:14:49 deraadt Exp $ */ +/* $OpenBSD: bgpd.c,v 1.22 2003/12/24 13:28:01 henning Exp $ */ /* * Copyright (c) 2003 Henning Brauer <henning@openbsd.org> @@ -221,11 +221,11 @@ main(int argc, char *argv[]) fatal("poll error", errno); if (nfds > 0 && (pfd[PFD_PIPE_SESSION].revents & POLLOUT)) - if ((n = msgbuf_write(&ibuf_se.w)) == -1) + if ((n = msgbuf_write(&ibuf_se.w)) < 0) fatal("pipe write error", errno); if (nfds > 0 && (pfd[PFD_PIPE_ROUTE].revents & POLLOUT)) - if ((n = msgbuf_write(&ibuf_rde.w)) == -1) + if ((n = msgbuf_write(&ibuf_rde.w)) < 0) fatal("pipe write error", errno); if (nfds > 0 && pfd[PFD_PIPE_SESSION].revents & POLLIN) { @@ -240,7 +240,7 @@ main(int argc, char *argv[]) for (j = PFD_MRT_START; j < i && nfds > 0 ; j++) { if (pfd[j].revents & POLLOUT) { - if ((n = msgbuf_write(&mrt[i]->msgbuf)) == -1) + if ((n = msgbuf_write(&mrt[i]->msgbuf)) < 0) fatal("pipe write error", errno); } } @@ -341,7 +341,7 @@ dispatch_imsg(struct imsgbuf *ibuf, int idx, struct mrt_config *conf) fatal("buf_open error", 0); if (buf_add(wbuf, imsg.data, len) == -1) fatal("buf_add error", 0); - if ((n = buf_close(&m->msgbuf, wbuf)) == -1) + if ((n = buf_close(&m->msgbuf, wbuf)) < 0) fatal("buf_close error", 0); break; } |