===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ftp/fetch.c,v
retrieving revision 1.44
retrieving revision 1.45
diff -c -r1.44 -r1.45
*** src/usr.bin/ftp/fetch.c	2003/03/10 06:20:10	1.44
--- src/usr.bin/ftp/fetch.c	2003/03/31 23:04:07	1.45
***************
*** 1,4 ****
! /*	$OpenBSD: fetch.c,v 1.44 2003/03/10 06:20:10 itojun Exp $	*/
  /*	$NetBSD: fetch.c,v 1.14 1997/08/18 10:20:20 lukem Exp $	*/
  
  /*-
--- 1,4 ----
! /*	$OpenBSD: fetch.c,v 1.45 2003/03/31 23:04:07 millert Exp $	*/
  /*	$NetBSD: fetch.c,v 1.14 1997/08/18 10:20:20 lukem Exp $	*/
  
  /*-
***************
*** 38,44 ****
   */
  
  #ifndef lint
! static char rcsid[] = "$OpenBSD: fetch.c,v 1.44 2003/03/10 06:20:10 itojun Exp $";
  #endif /* not lint */
  
  /*
--- 38,44 ----
   */
  
  #ifndef lint
! static char rcsid[] = "$OpenBSD: fetch.c,v 1.45 2003/03/31 23:04:07 millert Exp $";
  #endif /* not lint */
  
  /*
***************
*** 630,637 ****
  	(void)signal(SIGINT, (sig_t)intr);
  	(void)signal(SIGPIPE, (sig_t)lostpeer);
  
! 	ftpproxy = getenv(FTP_PROXY);
! 	httpproxy = getenv(HTTP_PROXY);
  
  	/*
  	 * Loop through as long as there's files to fetch.
--- 630,639 ----
  	(void)signal(SIGINT, (sig_t)intr);
  	(void)signal(SIGPIPE, (sig_t)lostpeer);
  
! 	if ((ftpproxy = getenv(FTP_PROXY)) != NULL && *ftpproxy == '\0')
! 		ftpproxy = NULL;
! 	if ((httpproxy = getenv(HTTP_PROXY)) != NULL && *httpproxy == '\0')
! 		httpproxy = NULL;
  
  	/*
  	 * Loop through as long as there's files to fetch.