===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ftp/fetch.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -c -r1.12 -r1.13
*** src/usr.bin/ftp/fetch.c	1997/05/19 05:36:56	1.12
--- src/usr.bin/ftp/fetch.c	1997/07/24 14:22:21	1.13
***************
*** 1,4 ****
! /*	$OpenBSD: fetch.c,v 1.12 1997/05/19 05:36:56 millert Exp $	*/
  /*	$NetBSD: fetch.c,v 1.8 1997/04/21 18:45:47 lukem Exp $	*/
  
  /*-
--- 1,4 ----
! /*	$OpenBSD: fetch.c,v 1.13 1997/07/24 14:22:21 deraadt Exp $	*/
  /*	$NetBSD: fetch.c,v 1.8 1997/04/21 18:45:47 lukem Exp $	*/
  
  /*-
***************
*** 38,44 ****
   */
  
  #ifndef lint
! static char rcsid[] = "$OpenBSD: fetch.c,v 1.12 1997/05/19 05:36:56 millert Exp $";
  #endif /* not lint */
  
  /*
--- 38,44 ----
   */
  
  #ifndef lint
! static char rcsid[] = "$OpenBSD: fetch.c,v 1.13 1997/07/24 14:22:21 deraadt Exp $";
  #endif /* not lint */
  
  /*
***************
*** 203,209 ****
  		    path);
  	else
  		fprintf(ttyout, "Requesting %s (via %s)\n", line, proxyenv);
! 	snprintf(buf, sizeof(buf), "GET %s%s HTTP/1.0\n\n",
  	    proxy ? "" : "/", path);
  	buflen = strlen(buf);
  	if (write(s, buf, buflen) < buflen) {
--- 203,209 ----
  		    path);
  	else
  		fprintf(ttyout, "Requesting %s (via %s)\n", line, proxyenv);
! 	snprintf(buf, sizeof(buf), "GET %s%s HTTP/1.0\r\n\r\n",
  	    proxy ? "" : "/", path);
  	buflen = strlen(buf);
  	if (write(s, buf, buflen) < buflen) {
***************
*** 253,269 ****
  		    strncasecmp(cp, CONTENTLEN, sizeof(CONTENTLEN) - 1) == 0)
  			break;
  	}
! 	if (*cp == '\0')
! 		goto improper;
! 	cp += sizeof(CONTENTLEN) - 1;
! 	cp2 = strchr(cp, '\n');
! 	if (cp2 == NULL)
! 		goto improper;
! 	else
! 		*cp2 = '\0';
! 	filesize = atoi(cp);
! 	if (filesize < 1)
! 		goto improper;
  
  	/* Open the output file. */
  	if (fd == -1) {
--- 253,270 ----
  		    strncasecmp(cp, CONTENTLEN, sizeof(CONTENTLEN) - 1) == 0)
  			break;
  	}
! 	if (*cp != '\0') {
! 		cp += sizeof(CONTENTLEN) - 1;
! 		cp2 = strchr(cp, '\n');
! 		if (cp2 == NULL)
! 			goto improper;
! 		else
! 			*cp2 = '\0';
! 		filesize = atoi(cp);
! 		if (filesize < 1)
! 			goto improper;
! 	} else
! 		filesize = -1;
  
  	/* Open the output file. */
  	if (fd == -1) {