===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tftp/main.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -c -r1.3 -r1.4
*** src/usr.bin/tftp/main.c	1996/08/16 23:31:00	1.3
--- src/usr.bin/tftp/main.c	1997/01/17 07:13:30	1.4
***************
*** 1,4 ****
! /*	$OpenBSD: main.c,v 1.3 1996/08/16 23:31:00 deraadt Exp $	*/
  /*	$NetBSD: main.c,v 1.6 1995/05/21 16:54:10 mycroft Exp $	*/
  
  /*
--- 1,4 ----
! /*	$OpenBSD: main.c,v 1.4 1997/01/17 07:13:30 millert Exp $	*/
  /*	$NetBSD: main.c,v 1.6 1995/05/21 16:54:10 mycroft Exp $	*/
  
  /*
***************
*** 44,50 ****
  #if 0
  static char sccsid[] = "@(#)main.c	8.1 (Berkeley) 6/6/93";
  #endif
! static char rcsid[] = "$OpenBSD: main.c,v 1.3 1996/08/16 23:31:00 deraadt Exp $";
  #endif /* not lint */
  
  /* Many bug fixes are from Jim Guyton <guyton@rand-unix> */
--- 44,50 ----
  #if 0
  static char sccsid[] = "@(#)main.c	8.1 (Berkeley) 6/6/93";
  #endif
! static char rcsid[] = "$OpenBSD: main.c,v 1.4 1997/01/17 07:13:30 millert Exp $";
  #endif /* not lint */
  
  /* Many bug fixes are from Jim Guyton <guyton@rand-unix> */
***************
*** 152,159 ****
  
  struct	cmd *getcmd();
  char	*tail();
- char	*index();
- char	*rindex();
  
  int
  main(argc, argv)
--- 152,157 ----
***************
*** 340,356 ****
  		return;
  	}
  	targ = argv[argc - 1];
! 	if (index(argv[argc - 1], ':')) {
  		char *cp;
  		struct hostent *hp;
  
  		for (n = 1; n < argc - 1; n++)
! 			if (index(argv[n], ':')) {
  				putusage(argv[0]);
  				return;
  			}
  		cp = argv[argc - 1];
! 		targ = index(cp, ':');
  		*targ++ = 0;
  		hp = gethostbyname(cp);
  		if (hp == NULL) {
--- 338,354 ----
  		return;
  	}
  	targ = argv[argc - 1];
! 	if (strchr(argv[argc - 1], ':')) {
  		char *cp;
  		struct hostent *hp;
  
  		for (n = 1; n < argc - 1; n++)
! 			if (strchr(argv[n], ':')) {
  				putusage(argv[0]);
  				return;
  			}
  		cp = argv[argc - 1];
! 		targ = strchr(cp, ':');
  		*targ++ = 0;
  		hp = gethostbyname(cp);
  		if (hp == NULL) {
***************
*** 383,389 ****
  	}
  				/* this assumes the target is a directory */
  				/* on a remote unix system.  hmmmm.  */
! 	cp = index(targ, '\0'); 
  	*cp++ = '/';
  	for (n = 1; n < argc - 1; n++) {
  		strcpy(cp, tail(argv[n]));
--- 381,387 ----
  	}
  				/* this assumes the target is a directory */
  				/* on a remote unix system.  hmmmm.  */
! 	cp = strchr(targ, '\0'); 
  	*cp++ = '/';
  	for (n = 1; n < argc - 1; n++) {
  		strcpy(cp, tail(argv[n]));
***************
*** 435,447 ****
  	}
  	if (!connected) {
  		for (n = 1; n < argc ; n++)
! 			if (index(argv[n], ':') == 0) {
  				getusage(argv[0]);
  				return;
  			}
  	}
  	for (n = 1; n < argc ; n++) {
! 		src = index(argv[n], ':');
  		if (src == NULL)
  			src = argv[n];
  		else {
--- 433,445 ----
  	}
  	if (!connected) {
  		for (n = 1; n < argc ; n++)
! 			if (strchr(argv[n], ':') == 0) {
  				getusage(argv[0]);
  				return;
  			}
  	}
  	for (n = 1; n < argc ; n++) {
! 		src = strchr(argv[n], ':');
  		if (src == NULL)
  			src = argv[n];
  		else {
***************
*** 583,589 ****
  	register char *s;
  	
  	while (*filename) {
! 		s = rindex(filename, '/');
  		if (s == NULL)
  			break;
  		if (s[1])
--- 581,587 ----
  	register char *s;
  	
  	while (*filename) {
! 		s = strrchr(filename, '/');
  		if (s == NULL)
  			break;
  		if (s[1])