===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ftp/fetch.c,v
retrieving revision 1.139.4.1
retrieving revision 1.140
diff -c -r1.139.4.1 -r1.140
*** src/usr.bin/ftp/fetch.c	2016/02/02 19:43:20	1.139.4.1
--- src/usr.bin/ftp/fetch.c	2015/09/09 19:23:03	1.140
***************
*** 1,4 ****
! /*	$OpenBSD: fetch.c,v 1.139.4.1 2016/02/02 19:43:20 martijn Exp $	*/
  /*	$NetBSD: fetch.c,v 1.14 1997/08/18 10:20:20 lukem Exp $	*/
  
  /*-
--- 1,4 ----
! /*	$OpenBSD: fetch.c,v 1.140 2015/09/09 19:23:03 jsing Exp $	*/
  /*	$NetBSD: fetch.c,v 1.14 1997/08/18 10:20:20 lukem Exp $	*/
  
  /*-
***************
*** 1549,1564 ****
  		}
  again:
  		ret = tls_read(tls, &c, 1, &nr);
! 		if (ret == TLS_READ_AGAIN)
  			goto again;
  		if (ret != 0)
! 			errx(1, "SSL read error: %u", ret);
  
  		buf[i] = c;
! 		if (c == '\n') {
! 			buf[i] = '\0';
  			break;
- 		}
  	}
  	*lenp = i;
  	return (buf);
--- 1549,1562 ----
  		}
  again:
  		ret = tls_read(tls, &c, 1, &nr);
! 		if (ret == TLS_READ_AGAIN || ret == TLS_WRITE_AGAIN)
  			goto again;
  		if (ret != 0)
! 			errx(1, "SSL read error: %s", tls_error(tls));
  
  		buf[i] = c;
! 		if (c == '\n')
  			break;
  	}
  	*lenp = i;
  	return (buf);