===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ftp/fetch.c,v
retrieving revision 1.49
retrieving revision 1.50
diff -c -r1.49 -r1.50
*** src/usr.bin/ftp/fetch.c	2004/02/28 20:08:38	1.49
--- src/usr.bin/ftp/fetch.c	2004/07/20 03:50:25	1.50
***************
*** 1,4 ****
! /*	$OpenBSD: fetch.c,v 1.49 2004/02/28 20:08:38 krw Exp $	*/
  /*	$NetBSD: fetch.c,v 1.14 1997/08/18 10:20:20 lukem Exp $	*/
  
  /*-
--- 1,4 ----
! /*	$OpenBSD: fetch.c,v 1.50 2004/07/20 03:50:25 deraadt Exp $	*/
  /*	$NetBSD: fetch.c,v 1.14 1997/08/18 10:20:20 lukem Exp $	*/
  
  /*-
***************
*** 38,44 ****
   */
  
  #if !defined(lint) && !defined(SMALL)
! static char rcsid[] = "$OpenBSD: fetch.c,v 1.49 2004/02/28 20:08:38 krw Exp $";
  #endif /* not lint and not SMALL */
  
  /*
--- 38,44 ----
   */
  
  #if !defined(lint) && !defined(SMALL)
! static char rcsid[] = "$OpenBSD: fetch.c,v 1.50 2004/07/20 03:50:25 deraadt Exp $";
  #endif /* not lint and not SMALL */
  
  /*
***************
*** 96,105 ****
   * Returns -1 on failure, 0 on success
   */
  static int
! url_get(origline, proxyenv, outfile)
! 	const char *origline;
! 	const char *proxyenv;
! 	const char *outfile;
  {
  	struct addrinfo hints, *res0, *res;
  	int error;
--- 96,102 ----
   * Returns -1 on failure, 0 on success
   */
  static int
! url_get(const char *origline, const char *proxyenv, const char *outfile)
  {
  	struct addrinfo hints, *res0, *res;
  	int error;
***************
*** 566,573 ****
   * Abort a http retrieval
   */
  void
! aborthttp(notused)
! 	int notused;
  {
  
  	alarmtimer(0);
--- 563,569 ----
   * Abort a http retrieval
   */
  void
! aborthttp(int notused)
  {
  
  	alarmtimer(0);
***************
*** 580,587 ****
   * Abort a http retrieval
   */
  void
! abortfile(notused)
! 	int notused;
  {
  
  	alarmtimer(0);
--- 576,582 ----
   * Abort a http retrieval
   */
  void
! abortfile(int notused)
  {
  
  	alarmtimer(0);
***************
*** 605,614 ****
   * Otherwise, 0 is returned if all files retrieved successfully.
   */
  int
! auto_fetch(argc, argv, outfile)
! 	int argc;
! 	char *argv[];
! 	char *outfile;
  {
  	char *xargv[5];
  	char *cp, *line, *host, *dir, *file, *portnum;
--- 600,606 ----
   * Otherwise, 0 is returned if all files retrieved successfully.
   */
  int
! auto_fetch(int argc, char *argv[], char *outfile)
  {
  	char *xargv[5];
  	char *cp, *line, *host, *dir, *file, *portnum;
***************
*** 871,878 ****
  }
  
  char *
! urldecode(str)
!         const char *str;
  {
          char *ret;
          char c;
--- 863,869 ----
  }
  
  char *
! urldecode(const char *str)
  {
          char *ret;
          char c;
***************
*** 903,910 ****
  }
  
  char
! hextochar(str)
!         const char *str;
  {
          char c, ret;
  
--- 894,900 ----
  }
  
  char
! hextochar(const char *str)
  {
          char c, ret;
  
***************
*** 926,933 ****
  }
  
  int
! isurl(p)
! 	const char *p;
  {
  
  	if (strncasecmp(p, FTP_URL, sizeof(FTP_URL) - 1) == 0 ||
--- 916,922 ----
  }
  
  int
! isurl(const char *p)
  {
  
  	if (strncasecmp(p, FTP_URL, sizeof(FTP_URL) - 1) == 0 ||