===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ftp/fetch.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -c -r1.6 -r1.7
*** src/usr.bin/ftp/fetch.c	1997/04/10 00:17:08	1.6
--- src/usr.bin/ftp/fetch.c	1997/04/14 00:48:44	1.7
***************
*** 1,4 ****
! /*	$OpenBSD: fetch.c,v 1.6 1997/04/10 00:17:08 millert Exp $	*/
  /*	$NetBSD: fetch.c,v 1.5 1997/04/05 03:27:36 lukem Exp $	*/
  
  /*-
--- 1,4 ----
! /*	$OpenBSD: fetch.c,v 1.7 1997/04/14 00:48:44 millert Exp $	*/
  /*	$NetBSD: fetch.c,v 1.5 1997/04/05 03:27:36 lukem Exp $	*/
  
  /*-
***************
*** 38,44 ****
   */
  
  #ifndef lint
! static char rcsid[] = "$OpenBSD: fetch.c,v 1.6 1997/04/10 00:17:08 millert Exp $";
  #endif /* not lint */
  
  /*
--- 38,44 ----
   */
  
  #ifndef lint
! static char rcsid[] = "$OpenBSD: fetch.c,v 1.7 1997/04/14 00:48:44 millert Exp $";
  #endif /* not lint */
  
  /*
***************
*** 97,105 ****
  	s = -1;
  	proxy = NULL;
  
! 	if (strncmp(line, HTTP_URL, sizeof(HTTP_URL) - 1) == 0)
  		host = line + sizeof(HTTP_URL) - 1;
! 	else if (strncmp(line, FTP_URL, sizeof(FTP_URL) - 1) == 0)
  		host = line + sizeof(FTP_URL) - 1;
  	else
  		errx(1, "url_get: invalid url '%s'", line);
--- 97,105 ----
  	s = -1;
  	proxy = NULL;
  
! 	if (strncasecmp(line, HTTP_URL, sizeof(HTTP_URL) - 1) == 0)
  		host = line + sizeof(HTTP_URL) - 1;
! 	else if (strncasecmp(line, FTP_URL, sizeof(FTP_URL) - 1) == 0)
  		host = line + sizeof(FTP_URL) - 1;
  	else
  		errx(1, "url_get: invalid url '%s'", line);
***************
*** 123,131 ****
  		proxy = strdup(proxyenv);
  		if (proxy == NULL)
  			errx(1, "Can't allocate memory for proxy url.");
! 		if (strncmp(proxy, HTTP_URL, sizeof(HTTP_URL) - 1) == 0)
  			host = proxy + sizeof(HTTP_URL) - 1;
! 		else if (strncmp(proxy, FTP_URL, sizeof(FTP_URL) - 1) == 0)
  			host = proxy + sizeof(FTP_URL) - 1;
  		else {
  			warnx("Malformed proxy url: %s", proxy);
--- 123,131 ----
  		proxy = strdup(proxyenv);
  		if (proxy == NULL)
  			errx(1, "Can't allocate memory for proxy url.");
! 		if (strncasecmp(proxy, HTTP_URL, sizeof(HTTP_URL) - 1) == 0)
  			host = proxy + sizeof(HTTP_URL) - 1;
! 		else if (strncasecmp(proxy, FTP_URL, sizeof(FTP_URL) - 1) == 0)
  			host = proxy + sizeof(FTP_URL) - 1;
  		else {
  			warnx("Malformed proxy url: %s", proxy);
***************
*** 408,414 ****
  		/*
  		 * Try HTTP URL-style arguments first.
  		 */
! 		if (strncmp(line, HTTP_URL, sizeof(HTTP_URL) - 1) == 0) {
  			if (url_get(line, httpproxy) == -1)
  				rval = argpos + 1;
  			continue;
--- 408,414 ----
  		/*
  		 * Try HTTP URL-style arguments first.
  		 */
! 		if (strncasecmp(line, HTTP_URL, sizeof(HTTP_URL) - 1) == 0) {
  			if (url_get(line, httpproxy) == -1)
  				rval = argpos + 1;
  			continue;
***************
*** 420,426 ****
  		 * Finally, try host:file.
  		 */
  		host = line;
! 		if (strncmp(line, FTP_URL, sizeof(FTP_URL) - 1) == 0) {
  			if (ftpproxy) {
  				if (url_get(line, ftpproxy) == -1)
  					rval = argpos + 1;
--- 420,426 ----
  		 * Finally, try host:file.
  		 */
  		host = line;
! 		if (strncasecmp(line, FTP_URL, sizeof(FTP_URL) - 1) == 0) {
  			if (ftpproxy) {
  				if (url_get(line, ftpproxy) == -1)
  					rval = argpos + 1;