summaryrefslogtreecommitdiffstats
path: root/usr.sbin/ppp/main.c
diff options
context:
space:
mode:
authorbrian <brian@FreeBSD.org>2002-03-30 12:30:09 +0000
committerbrian <brian@FreeBSD.org>2002-03-30 12:30:09 +0000
commitee9763124d8cbeceba9f2194f3ea61c1f2c1d362 (patch)
treeb285f7b912098d74c02bd2a8b542e1472a52003a /usr.sbin/ppp/main.c
parentef538de24ea069ff6846f7363f8a329a92cf1aa1 (diff)
downloadFreeBSD-src-ee9763124d8cbeceba9f2194f3ea61c1f2c1d362.zip
FreeBSD-src-ee9763124d8cbeceba9f2194f3ea61c1f2c1d362.tar.gz
Merge the NETGRAPH branch into HEAD. tty devices now use netgraph's line
discipline to do the async escaping, but no other benefits are available yet. Change ``ifdef HAVE_DES'' to ``ifndef NODES'' for consistency. Make the Makefile a little more sane WRT RELEASE_CRUNCH.
Diffstat (limited to 'usr.sbin/ppp/main.c')
-rw-r--r--usr.sbin/ppp/main.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/usr.sbin/ppp/main.c b/usr.sbin/ppp/main.c
index 387cec7..6cf390c 100644
--- a/usr.sbin/ppp/main.c
+++ b/usr.sbin/ppp/main.c
@@ -653,9 +653,9 @@ DoLoop(struct bundle *bundle)
}
if (descriptor_IsSet(&bundle->desc, wfds))
- if (!descriptor_Write(&bundle->desc, bundle, wfds) && nothing_done) {
+ if (descriptor_Write(&bundle->desc, bundle, wfds) <= 0 && nothing_done) {
/*
- * This is disasterous. The OS has told us that something is
+ * This is disastrous. The OS has told us that something is
* writable, and all our write()s have failed. Rather than
* going back immediately to do our UpdateSet()s and select(),
* we sleep for a bit to avoid gobbling up all cpu time.
OpenPOWER on IntegriCloud