summaryrefslogtreecommitdiffstats
path: root/contrib/netcat/socks.c
diff options
context:
space:
mode:
authordelphij <delphij@FreeBSD.org>2016-01-18 19:42:05 +0000
committerdelphij <delphij@FreeBSD.org>2016-01-18 19:42:05 +0000
commit2a668e7e333710c85c381ba1c8a933c8e95d930b (patch)
tree20eb11f9b40edfe0a82b689424c57139d18b39b5 /contrib/netcat/socks.c
parentfa1e90c82bb54806d86166769a4547bf68c3e727 (diff)
downloadFreeBSD-src-2a668e7e333710c85c381ba1c8a933c8e95d930b.zip
FreeBSD-src-2a668e7e333710c85c381ba1c8a933c8e95d930b.tar.gz
MFC r288303: MFV r288243: nc from OpenBSD 5.8.
Diffstat (limited to 'contrib/netcat/socks.c')
-rw-r--r--contrib/netcat/socks.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/contrib/netcat/socks.c b/contrib/netcat/socks.c
index f8adda4..1b06e0e 100644
--- a/contrib/netcat/socks.c
+++ b/contrib/netcat/socks.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: socks.c,v 1.20 2012/03/08 09:56:28 espie Exp $ */
+/* $OpenBSD: socks.c,v 1.21 2015/03/26 21:19:51 tobias Exp $ */
/*
* Copyright (c) 1999 Niklas Hallqvist. All rights reserved.
@@ -308,8 +308,8 @@ socks_connect(const char *host, const char *port,
}
/* Terminate headers */
- if ((r = atomicio(vwrite, proxyfd, "\r\n", 2)) != 2)
- err(1, "write failed (2/%d)", r);
+ if ((cnt = atomicio(vwrite, proxyfd, "\r\n", 2)) != 2)
+ err(1, "write failed (%zu/2)", cnt);
/* Read status reply */
proxy_read_line(proxyfd, buf, sizeof(buf));
OpenPOWER on IntegriCloud