3 files changed, 10 insertions, 6 deletions

diff --git a/src/usr.bin/nc/atomicio.c b/src/usr.bin/nc/atomicio.c
index 02289f0a2a..4437b6717b 100644
--- a/src/usr.bin/nc/atomicio.c
+++ b/src/usr.bin/nc/atomicio.c
@@ -29,6 +29,8 @@
 #include <errno.h>
 #include <unistd.h>
 
+ssize_t atomicio(ssize_t (*f)(int, void *, size_t), int fd, void *_s, size_t n);
+
 /*
  * ensure all of data on socket comes through. f==read || f==write
  */
diff --git a/src/usr.bin/nc/netcat.c b/src/usr.bin/nc/netcat.c
index 8e02196c3a..41de61fb33 100644
--- a/src/usr.bin/nc/netcat.c
+++ b/src/usr.bin/nc/netcat.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: netcat.c,v 1.60 2003/07/07 14:12:18 avsm Exp $ */
+/* $OpenBSD: netcat.c,v 1.61 2003/07/07 21:36:23 deraadt Exp $ */
 /*
  * Copyright (c) 2001 Eric Jackson <ericj@monkey.org>
  *
@@ -220,7 +220,6 @@ main(int argc, char *argv[])
                         hints.ai_flags |= AI_NUMERICHOST;
         }
 
-
         if (xflag) {
                 if (uflag)
                         errx(1, "no proxy support for UDP mode");
diff --git a/src/usr.bin/nc/socks.c b/src/usr.bin/nc/socks.c
index 25779d2e99..a6b4fdd7e3 100644
--- a/src/usr.bin/nc/socks.c
+++ b/src/usr.bin/nc/socks.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: socks.c,v 1.7 2003/06/03 20:49:29 deraadt Exp $       */
+/*      $OpenBSD: socks.c,v 1.8 2003/07/07 21:36:23 deraadt Exp $       */
 
 /*
  * Copyright (c) 1999 Niklas Hallqvist.  All rights reserved.
@@ -46,9 +46,12 @@
 #define SOCKS_MAXCMDSZ  10
 
 int     remote_connect(char *, char *, struct addrinfo);
+int     socks_connect(char *host, char *port, struct addrinfo hints,
+            char *proxyhost, char *proxyport, struct addrinfo proxyhints,
+            int socksv);
 
 static in_addr_t
-decode_addr (const char *s)
+decode_addr(const char *s)
 {
         struct hostent *hp = gethostbyname (s);
         struct in_addr retval;
@@ -61,7 +64,7 @@ decode_addr (const char *s)
 }
 
 static in_port_t
-decode_port (const char *s)
+decode_port(const char *s)
 {
         struct servent *sp;
         in_port_t port;
@@ -79,7 +82,7 @@ decode_port (const char *s)
 }
 
 int
-socks_connect (char *host, char *port, struct addrinfo hints,
+socks_connect(char *host, char *port, struct addrinfo hints,
     char *proxyhost, char *proxyport, struct addrinfo proxyhints,
     int socksv)
 {