===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/nc/socks.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -c -r1.17 -r1.18
*** src/usr.bin/nc/socks.c	2006/09/25 04:51:20	1.17
--- src/usr.bin/nc/socks.c	2010/04/20 07:26:35	1.18
***************
*** 1,4 ****
! /*	$OpenBSD: socks.c,v 1.17 2006/09/25 04:51:20 ray Exp $	*/
  
  /*
   * Copyright (c) 1999 Niklas Hallqvist.  All rights reserved.
--- 1,4 ----
! /*	$OpenBSD: socks.c,v 1.18 2010/04/20 07:26:35 nicm Exp $	*/
  
  /*
   * Copyright (c) 1999 Niklas Hallqvist.  All rights reserved.
***************
*** 167,177 ****
  		buf[2] = SOCKS_NOAUTH;
  		cnt = atomicio(vwrite, proxyfd, buf, 3);
  		if (cnt != 3)
! 			err(1, "write failed (%d/3)", cnt);
  
  		cnt = atomicio(read, proxyfd, buf, 2);
  		if (cnt != 2)
! 			err(1, "read failed (%d/3)", cnt);
  
  		if (buf[1] == SOCKS_NOMETHOD)
  			errx(1, "authentication method negotiation failed");
--- 167,177 ----
  		buf[2] = SOCKS_NOAUTH;
  		cnt = atomicio(vwrite, proxyfd, buf, 3);
  		if (cnt != 3)
! 			err(1, "write failed (%zu/3)", cnt);
  
  		cnt = atomicio(read, proxyfd, buf, 2);
  		if (cnt != 2)
! 			err(1, "read failed (%zu/3)", cnt);
  
  		if (buf[1] == SOCKS_NOMETHOD)
  			errx(1, "authentication method negotiation failed");
***************
*** 220,230 ****
  
  		cnt = atomicio(vwrite, proxyfd, buf, wlen);
  		if (cnt != wlen)
! 			err(1, "write failed (%d/%d)", cnt, wlen);
  
  		cnt = atomicio(read, proxyfd, buf, 10);
  		if (cnt != 10)
! 			err(1, "read failed (%d/10)", cnt);
  		if (buf[1] != 0)
  			errx(1, "connection failed, SOCKS error %d", buf[1]);
  	} else if (socksv == 4) {
--- 220,230 ----
  
  		cnt = atomicio(vwrite, proxyfd, buf, wlen);
  		if (cnt != wlen)
! 			err(1, "write failed (%zu/%zu)", cnt, wlen);
  
  		cnt = atomicio(read, proxyfd, buf, 10);
  		if (cnt != 10)
! 			err(1, "read failed (%zu/10)", cnt);
  		if (buf[1] != 0)
  			errx(1, "connection failed, SOCKS error %d", buf[1]);
  	} else if (socksv == 4) {
***************
*** 242,252 ****
  
  		cnt = atomicio(vwrite, proxyfd, buf, wlen);
  		if (cnt != wlen)
! 			err(1, "write failed (%d/%d)", cnt, wlen);
  
  		cnt = atomicio(read, proxyfd, buf, 8);
  		if (cnt != 8)
! 			err(1, "read failed (%d/8)", cnt);
  		if (buf[1] != 90)
  			errx(1, "connection failed, SOCKS error %d", buf[1]);
  	} else if (socksv == -1) {
--- 242,252 ----
  
  		cnt = atomicio(vwrite, proxyfd, buf, wlen);
  		if (cnt != wlen)
! 			err(1, "write failed (%zu/%zu)", cnt, wlen);
  
  		cnt = atomicio(read, proxyfd, buf, 8);
  		if (cnt != 8)
! 			err(1, "read failed (%zu/8)", cnt);
  		if (buf[1] != 90)
  			errx(1, "connection failed, SOCKS error %d", buf[1]);
  	} else if (socksv == -1) {
***************
*** 272,278 ****
  
  		cnt = atomicio(vwrite, proxyfd, buf, r);
  		if (cnt != r)
! 			err(1, "write failed (%d/%d)", cnt, r);
  
  		if (authretry > 1) {
  			char resp[1024];
--- 272,278 ----
  
  		cnt = atomicio(vwrite, proxyfd, buf, r);
  		if (cnt != r)
! 			err(1, "write failed (%zu/%d)", cnt, r);
  
  		if (authretry > 1) {
  			char resp[1024];
***************
*** 290,296 ****
  				errx(1, "Proxy auth response too long");
  			r = strlen(buf);
  			if ((cnt = atomicio(vwrite, proxyfd, buf, r)) != r)
! 				err(1, "write failed (%d/%d)", cnt, r);
  		}
  
  		/* Terminate headers */
--- 290,296 ----
  				errx(1, "Proxy auth response too long");
  			r = strlen(buf);
  			if ((cnt = atomicio(vwrite, proxyfd, buf, r)) != r)
! 				err(1, "write failed (%zu/%d)", cnt, r);
  		}
  
  		/* Terminate headers */