diff options
author | Matteo Bernardini | 2020-01-03 23:09:25 +0100 |
---|---|---|
committer | Matteo Bernardini | 2020-01-03 23:09:25 +0100 |
commit | 95008285045d7130c028d6755dcc2bae5387cb22 (patch) | |
tree | 65f9ab22c4711d52dbe2d3a77112b00e4a8e051d /network/netcat-openbsd/patches/0004-poll-hup.patch | |
parent | 66bb71ec178eb531b8a07c19457800341c8f0d9f (diff) | |
download | slackbuilds-95008285045d7130c028d6755dcc2bae5387cb22.tar.gz |
20200103.1 global branch merge.current-20200103.1
Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>
Diffstat (limited to 'network/netcat-openbsd/patches/0004-poll-hup.patch')
-rw-r--r-- | network/netcat-openbsd/patches/0004-poll-hup.patch | 59 |
1 files changed, 0 insertions, 59 deletions
diff --git a/network/netcat-openbsd/patches/0004-poll-hup.patch b/network/netcat-openbsd/patches/0004-poll-hup.patch deleted file mode 100644 index 14923cbfa2..0000000000 --- a/network/netcat-openbsd/patches/0004-poll-hup.patch +++ /dev/null @@ -1,59 +0,0 @@ -From: Aron Xu <aron@debian.org> -Date: Mon, 13 Feb 2012 15:08:33 +0800 -Subject: poll hup - ---- - netcat.c | 24 +++++++++++++++++------- - 1 file changed, 17 insertions(+), 7 deletions(-) - -diff --git a/netcat.c b/netcat.c -index d912544..fdaca44 100644 ---- a/netcat.c -+++ b/netcat.c -@@ -884,9 +884,7 @@ readwrite(int nfd) - if ((n = read(nfd, buf, plen)) < 0) - return; - else if (n == 0) { -- shutdown(nfd, SHUT_RD); -- pfd[0].fd = -1; -- pfd[0].events = 0; -+ goto shutdown_rd; - } else { - if (tflag) - atelnet(nfd, buf, n); -@@ -894,18 +892,30 @@ readwrite(int nfd) - return; - } - } -+ else if (pfd[0].revents & POLLHUP) { -+ shutdown_rd: -+ shutdown(nfd, SHUT_RD); -+ pfd[0].fd = -1; -+ pfd[0].events = 0; -+ } - -- if (!dflag && pfd[1].revents & POLLIN) { -+ if (!dflag) { -+ if(pfd[1].revents & POLLIN) { - if ((n = read(wfd, buf, plen)) < 0) - return; - else if (n == 0) { -- shutdown(nfd, SHUT_WR); -- pfd[1].fd = -1; -- pfd[1].events = 0; -+ goto shutdown_wr; - } else { - if (atomicio(vwrite, nfd, buf, n) != n) - return; - } -+ } -+ else if (pfd[1].revents & POLLHUP) { -+ shutdown_wr: -+ shutdown(nfd, SHUT_WR); -+ pfd[1].fd = -1; -+ pfd[1].events = 0; -+ } - } - } - } --- |