RepoMirrors
/
openssh
mirror of git://anongit.mindrot.org/openssh.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

partial sync of regress/netcat.c with upstream 

Check for short writes in fdpass(). Clean up while at it.

ok djm
This commit is contained in:
tobias 2015-03-26 10:36:03 +00:00 committed by Damien Miller
parent e18435fec1
commit bf3893dddd
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
regress/netcat.c
View File

@ -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> * Copyright (c) 2001 Eric Jackson <ericj@monkey.org>
* *
@ -1034,17 +1034,17 @@ fdpass(int nfd)
bzero(&pfd, sizeof(pfd)); bzero(&pfd, sizeof(pfd));
pfd.fd = STDOUT_FILENO; pfd.fd = STDOUT_FILENO;
pfd.events = POLLOUT;
for (;;) { for (;;) {
r = sendmsg(STDOUT_FILENO, &msg, 0); r = sendmsg(STDOUT_FILENO, &msg, 0);
if (r == -1) { if (r == -1) {
if (errno == EAGAIN || errno == EINTR) { if (errno == EAGAIN || errno == EINTR) {
pfd.events = POLLOUT;
if (poll(&pfd, 1, -1) == -1) if (poll(&pfd, 1, -1) == -1)
err(1, "poll"); err(1, "poll");
continue; continue;
} }
err(1, "sendmsg"); err(1, "sendmsg");
} else if (r == -1) } else if (r != 1)
errx(1, "sendmsg: unexpected return value %zd", r); errx(1, "sendmsg: unexpected return value %zd", r);
else else
break; break;