===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ftp/cmds.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -c -r1.14 -r1.15
*** src/usr.bin/ftp/cmds.c	1997/02/03 01:05:33	1.14
--- src/usr.bin/ftp/cmds.c	1997/02/05 04:55:12	1.15
***************
*** 1,4 ****
! /*	$OpenBSD: cmds.c,v 1.14 1997/02/03 01:05:33 millert Exp $	*/
  /*	$NetBSD: cmds.c,v 1.18 1997/02/01 10:44:54 lukem Exp $	*/
  
  /*
--- 1,4 ----
! /*	$OpenBSD: cmds.c,v 1.15 1997/02/05 04:55:12 millert Exp $	*/
  /*	$NetBSD: cmds.c,v 1.18 1997/02/01 10:44:54 lukem Exp $	*/
  
  /*
***************
*** 38,44 ****
  #if 0
  static char sccsid[] = "@(#)cmds.c	8.6 (Berkeley) 10/9/94";
  #else
! static char rcsid[] = "$OpenBSD: cmds.c,v 1.14 1997/02/03 01:05:33 millert Exp $";
  #endif
  #endif /* not lint */
  
--- 38,44 ----
  #if 0
  static char sccsid[] = "@(#)cmds.c	8.6 (Berkeley) 10/9/94";
  #else
! static char rcsid[] = "$OpenBSD: cmds.c,v 1.15 1997/02/05 04:55:12 millert Exp $";
  #endif
  #endif /* not lint */
  
***************
*** 119,125 ****
  		return;
  	}
  	if ((p->t_arg != NULL) && (*(p->t_arg) != '\0'))
! 		comret = command ("TYPE %s %s", p->t_mode, p->t_arg);
  	else
  		comret = command("TYPE %s", p->t_mode);
  	if (comret == COMPLETE) {
--- 119,125 ----
  		return;
  	}
  	if ((p->t_arg != NULL) && (*(p->t_arg) != '\0'))
! 		comret = command("TYPE %s %s", p->t_mode, p->t_arg);
  	else
  		comret = command("TYPE %s", p->t_mode);
  	if (comret == COMPLETE) {
***************
*** 701,707 ****
  		printf("usage: %s [ on | off ]\n", argv[0]);
  		return -1;
  	}
! 	printf("%s %s.\n", mesg, onoff(*var));
  	return (*var);
  }
  
--- 701,708 ----
  		printf("usage: %s [ on | off ]\n", argv[0]);
  		return -1;
  	}
! 	if (mesg)
! 		printf("%s %s.\n", mesg, onoff(*var));
  	return (*var);
  }
  
***************
*** 1504,1510 ****
  jmp_buf abortprox;
  
  void
! proxabort()
  {
  
  	alarmtimer(0);
--- 1505,1512 ----
  jmp_buf abortprox;
  
  void
! proxabort(notused)
! 	int notused;
  {
  
  	alarmtimer(0);
***************
*** 1862,1868 ****
  	char *argv[];
  {
  
! 	code = togglevar(argc, argv, &passivemode, "Passive mode");
  }
  
  void
--- 1864,1871 ----
  	char *argv[];
  {
  
! 	code = togglevar(argc, argv, &passivemode,
! 	    verbose ? "Passive mode" : NULL);
  }
  
  void