===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ftp/fetch.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -c -r1.4 -r1.5
*** src/usr.bin/ftp/fetch.c	1997/03/14 04:32:14	1.4
--- src/usr.bin/ftp/fetch.c	1997/03/21 20:59:29	1.5
***************
*** 1,5 ****
! /*	$OpenBSD: fetch.c,v 1.4 1997/03/14 04:32:14 millert Exp $	*/
! /*	$NetBSD: fetch.c,v 1.3 1997/03/13 06:23:15 lukem Exp $	*/
  
  /*-
   * Copyright (c) 1997 The NetBSD Foundation, Inc.
--- 1,5 ----
! /*	$OpenBSD: fetch.c,v 1.5 1997/03/21 20:59:29 millert Exp $	*/
! /*	$NetBSD: fetch.c,v 1.4 1997/03/16 14:24:18 lukem Exp $	*/
  
  /*-
   * Copyright (c) 1997 The NetBSD Foundation, Inc.
***************
*** 38,44 ****
   */
  
  #ifndef lint
! static char rcsid[] = "$OpenBSD: fetch.c,v 1.4 1997/03/14 04:32:14 millert Exp $";
  #endif /* not lint */
  
  /*
--- 38,44 ----
   */
  
  #ifndef lint
! static char rcsid[] = "$OpenBSD: fetch.c,v 1.5 1997/03/21 20:59:29 millert Exp $";
  #endif /* not lint */
  
  /*
***************
*** 448,454 ****
  		 * Set up the connection if we don't have one.
  		 */
  		if (strcmp(host, lasthost) != 0) {
! 			strcpy(lasthost, host);
  			if (connected)
  				disconnect(0, NULL);
  			xargv[0] = __progname;
--- 448,454 ----
  		 * Set up the connection if we don't have one.
  		 */
  		if (strcmp(host, lasthost) != 0) {
! 			(void)strcpy(lasthost, host);
  			if (connected)
  				disconnect(0, NULL);
  			xargv[0] = __progname;
***************
*** 528,534 ****
  			interactive = 0;
  			xargv[0] = "mget";
  			mget(2, xargv);
! 			interactive = 1;
  		} else
  			get(2, xargv);
  
--- 528,534 ----
  			interactive = 0;
  			xargv[0] = "mget";
  			mget(2, xargv);
! 			interactive = ointeractive;
  		} else
  			get(2, xargv);