===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ftp/fetch.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -c -r1.11 -r1.12
*** src/usr.bin/ftp/fetch.c	1997/04/28 21:10:06	1.11
--- src/usr.bin/ftp/fetch.c	1997/05/19 05:36:56	1.12
***************
*** 1,4 ****
! /*	$OpenBSD: fetch.c,v 1.11 1997/04/28 21:10:06 millert Exp $	*/
  /*	$NetBSD: fetch.c,v 1.8 1997/04/21 18:45:47 lukem Exp $	*/
  
  /*-
--- 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 $	*/
  
  /*-
***************
*** 38,44 ****
   */
  
  #ifndef lint
! static char rcsid[] = "$OpenBSD: fetch.c,v 1.11 1997/04/28 21:10:06 millert Exp $";
  #endif /* not lint */
  
  /*
--- 38,44 ----
   */
  
  #ifndef lint
! static char rcsid[] = "$OpenBSD: fetch.c,v 1.12 1997/05/19 05:36:56 millert Exp $";
  #endif /* not lint */
  
  /*
***************
*** 448,454 ****
  				continue;
  			}
  			*pass++ = '\0';
! 			cp = strpbrk(pass, ":@/");
  			if (cp == NULL || *cp == '/') {
  				portnum = pass;
  				pass = NULL;
--- 448,456 ----
  				continue;
  			}
  			*pass++ = '\0';
! 			/* XXX - assumes no '@' in pathname */
! 			if ((cp = strrchr(pass, '@')) == NULL)
! 				cp = strpbrk(pass, ":@/");
  			if (cp == NULL || *cp == '/') {
  				portnum = pass;
  				pass = NULL;