From c7f9562c6817ff9e8173bdc36298349d8bf028c4 Mon Sep 17 00:00:00 2001
From: tobias <>
Date: Thu, 26 Mar 2015 10:36:03 +0000
Subject: Check for short writes in fdpass(). Clean up while at it.

ok djm
---
 src/usr.bin/nc/netcat.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/usr.bin/nc/netcat.c b/src/usr.bin/nc/netcat.c
index ce7fde4525..88a2a25053 100644
--- a/src/usr.bin/nc/netcat.c
+++ b/src/usr.bin/nc/netcat.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: netcat.c,v 1.127 2015/02/14 22:40:22 jca Exp $ */
+/* $OpenBSD: netcat.c,v 1.128 2015/03/26 10:36:03 tobias Exp $ */
 /*
  * Copyright (c) 2001 Eric Jackson <ericj@monkey.org>
  *
@@ -980,7 +980,6 @@ fdpass(int nfd)
 	bzero(&mh, sizeof(mh));
 	bzero(&cmsgbuf, sizeof(cmsgbuf));
 	bzero(&iov, sizeof(iov));
-	bzero(&pfd, sizeof(pfd));
 
 	mh.msg_control = (caddr_t)&cmsgbuf.buf;
 	mh.msg_controllen = sizeof(cmsgbuf.buf);
@@ -997,17 +996,17 @@ fdpass(int nfd)
 
 	bzero(&pfd, sizeof(pfd));
 	pfd.fd = STDOUT_FILENO;
+	pfd.events = POLLOUT;
 	for (;;) {
 		r = sendmsg(STDOUT_FILENO, &mh, 0);
 		if (r == -1) {
 			if (errno == EAGAIN || errno == EINTR) {
-				pfd.events = POLLOUT;
 				if (poll(&pfd, 1, -1) == -1)
 					err(1, "poll");
 				continue;
 			}
 			err(1, "sendmsg");
-		} else if (r == -1)
+		} else if (r != 1)
 			errx(1, "sendmsg: unexpected return value %zd", r);
 		else
 			break;
-- 
cgit v1.2.3-55-g6feb