===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ftp/cmds.c,v
retrieving revision 1.47
retrieving revision 1.48
diff -c -r1.47 -r1.48
*** src/usr.bin/ftp/cmds.c	2004/07/20 03:50:25	1.47
--- src/usr.bin/ftp/cmds.c	2004/09/16 04:39:16	1.48
***************
*** 1,4 ****
! /*	$OpenBSD: cmds.c,v 1.47 2004/07/20 03:50:25 deraadt Exp $	*/
  /*	$NetBSD: cmds.c,v 1.27 1997/08/18 10:20:15 lukem Exp $	*/
  
  /*
--- 1,4 ----
! /*	$OpenBSD: cmds.c,v 1.48 2004/09/16 04:39:16 deraadt Exp $	*/
  /*	$NetBSD: cmds.c,v 1.27 1997/08/18 10:20:15 lukem Exp $	*/
  
  /*
***************
*** 60,66 ****
   */
  
  #if !defined(lint) && !defined(SMALL)
! static char rcsid[] = "$OpenBSD: cmds.c,v 1.47 2004/07/20 03:50:25 deraadt Exp $";
  #endif /* not lint and not SMALL */
  
  /*
--- 60,66 ----
   */
  
  #if !defined(lint) && !defined(SMALL)
! static char rcsid[] = "$OpenBSD: cmds.c,v 1.48 2004/09/16 04:39:16 deraadt Exp $";
  #endif /* not lint and not SMALL */
  
  /*
***************
*** 189,195 ****
  /*
   * Set binary transfer type.
   */
! /*VARARGS*/
  void
  setbinary(int argc, char *argv[])
  {
--- 189,195 ----
  /*
   * Set binary transfer type.
   */
! /*ARGSUSED*/
  void
  setbinary(int argc, char *argv[])
  {
***************
*** 201,207 ****
  /*
   * Set ascii transfer type.
   */
! /*VARARGS*/
  void
  setascii(int argc, char *argv[])
  {
--- 201,207 ----
  /*
   * Set ascii transfer type.
   */
! /*ARGSUSED*/
  void
  setascii(int argc, char *argv[])
  {
***************
*** 213,219 ****
  /*
   * Set tenex transfer type.
   */
! /*VARARGS*/
  void
  settenex(int argc, char *argv[])
  {
--- 213,219 ----
  /*
   * Set tenex transfer type.
   */
! /*ARGSUSED*/
  void
  settenex(int argc, char *argv[])
  {
***************
*** 706,712 ****
  /*
   * Set beep on cmd completed mode.
   */
! /*VARARGS*/
  void
  setbell(int argc, char *argv[])
  {
--- 706,712 ----
  /*
   * Set beep on cmd completed mode.
   */
! /*ARGSUSED*/
  void
  setbell(int argc, char *argv[])
  {
***************
*** 718,724 ****
  /*
   * Set command line editing
   */
! /*VARARGS*/
  void
  setedit(int argc, char *argv[])
  {
--- 718,724 ----
  /*
   * Set command line editing
   */
! /*ARGSUSED*/
  void
  setedit(int argc, char *argv[])
  {
***************
*** 731,737 ****
  /*
   * Toggle use of IPv4 EPSV/EPRT
   */
! /*VARARGS*/
  void
  setepsv4(int argc, char *argv[])
  {
--- 731,737 ----
  /*
   * Toggle use of IPv4 EPSV/EPRT
   */
! /*ARGSUSED*/
  void
  setepsv4(int argc, char *argv[])
  {
***************
*** 743,749 ****
  /*
   * Turn on packet tracing.
   */
! /*VARARGS*/
  void
  settrace(int argc, char *argv[])
  {
--- 743,749 ----
  /*
   * Turn on packet tracing.
   */
! /*ARGSUSED*/
  void
  settrace(int argc, char *argv[])
  {
***************
*** 754,760 ****
  /*
   * Toggle hash mark printing during transfers, or set hash mark bytecount.
   */
! /*VARARGS*/
  void
  sethash(int argc, char *argv[])
  {
--- 754,760 ----
  /*
   * Toggle hash mark printing during transfers, or set hash mark bytecount.
   */
! /*ARGSUSED*/
  void
  sethash(int argc, char *argv[])
  {
***************
*** 791,797 ****
  /*
   * Turn on printing of server echo's.
   */
! /*VARARGS*/
  void
  setverbose(int argc, char *argv[])
  {
--- 791,797 ----
  /*
   * Turn on printing of server echo's.
   */
! /*ARGSUSED*/
  void
  setverbose(int argc, char *argv[])
  {
***************
*** 802,808 ****
  /*
   * Toggle PORT/LPRT cmd use before each data connection.
   */
! /*VARARGS*/
  void
  setport(int argc, char *argv[])
  {
--- 802,808 ----
  /*
   * Toggle PORT/LPRT cmd use before each data connection.
   */
! /*ARGSUSED*/
  void
  setport(int argc, char *argv[])
  {
***************
*** 813,819 ****
  /*
   * Toggle transfer progress bar.
   */
! /*VARARGS*/
  void
  setprogress(int argc, char *argv[])
  {
--- 813,819 ----
  /*
   * Toggle transfer progress bar.
   */
! /*ARGSUSED*/
  void
  setprogress(int argc, char *argv[])
  {
***************
*** 824,830 ****
  /*
   * Turn on interactive prompting during mget, mput, and mdelete.
   */
! /*VARARGS*/
  void
  setprompt(int argc, char *argv[])
  {
--- 824,830 ----
  /*
   * Turn on interactive prompting during mget, mput, and mdelete.
   */
! /*ARGSUSED*/
  void
  setprompt(int argc, char *argv[])
  {
***************
*** 835,841 ****
  /*
   * Toggle gate-ftp mode, or set gate-ftp server
   */
! /*VARARGS*/
  void
  setgate(int argc, char *argv[])
  {
--- 835,841 ----
  /*
   * Toggle gate-ftp mode, or set gate-ftp server
   */
! /*ARGSUSED*/
  void
  setgate(int argc, char *argv[])
  {
***************
*** 894,900 ****
  /*
   * Toggle metacharacter interpretation on local file names.
   */
! /*VARARGS*/
  void
  setglob(int argc, char *argv[])
  {
--- 894,900 ----
  /*
   * Toggle metacharacter interpretation on local file names.
   */
! /*ARGSUSED*/
  void
  setglob(int argc, char *argv[])
  {
***************
*** 905,911 ****
  /*
   * Toggle preserving modification times on retrieved files.
   */
! /*VARARGS*/
  void
  setpreserve(int argc, char *argv[])
  {
--- 905,911 ----
  /*
   * Toggle preserving modification times on retrieved files.
   */
! /*ARGSUSED*/
  void
  setpreserve(int argc, char *argv[])
  {
***************
*** 916,922 ****
  /*
   * Set debugging mode on/off and/or set level of debugging.
   */
! /*VARARGS*/
  void
  setdebug(int argc, char *argv[])
  {
--- 916,922 ----
  /*
   * Set debugging mode on/off and/or set level of debugging.
   */
! /*ARGSUSED*/
  void
  setdebug(int argc, char *argv[])
  {
***************
*** 1019,1025 ****
   * Delete a single file.
   */
  void
! delete(int argc, char *argv[])
  {
  
  	if ((argc < 2 && !another(&argc, &argv, "remote-file")) || argc > 2) {
--- 1019,1025 ----
   * Delete a single file.
   */
  void
! deletecmd(int argc, char *argv[])
  {
  
  	if ((argc < 2 && !another(&argc, &argv, "remote-file")) || argc > 2) {
***************
*** 1282,1288 ****
  /*
   * Print working directory on remote machine.
   */
! /*VARARGS*/
  void
  pwd(int argc, char *argv[])
  {
--- 1282,1288 ----
  /*
   * Print working directory on remote machine.
   */
! /*ARGSUSED*/
  void
  pwd(int argc, char *argv[])
  {
***************
*** 1302,1307 ****
--- 1302,1308 ----
  /*
   * Print working directory on local machine.
   */
+ /* ARGSUSED */
  void
  lpwd(int argc, char *argv[])
  {
***************
*** 1480,1486 ****
  /*
   * Terminate session and exit.
   */
! /*VARARGS*/
  void
  quit(int argc, char *argv[])
  {
--- 1481,1487 ----
  /*
   * Terminate session and exit.
   */
! /*ARGSUSED*/
  void
  quit(int argc, char *argv[])
  {
***************
*** 1497,1502 ****
--- 1498,1504 ----
  /*
   * Terminate session, but don't exit.
   */
+ /* ARGSUSED */
  void
  disconnect(int argc, char *argv[])
  {
***************
*** 1534,1541 ****
  
  jmp_buf abortprox;
  
  void
! proxabort(int notused)
  {
  
  	alarmtimer(0);
--- 1536,1544 ----
  
  jmp_buf abortprox;
  
+ /* ARGSUSED */
  void
! proxabort(int signo)
  {
  
  	alarmtimer(0);
***************
*** 1898,1903 ****
--- 1901,1907 ----
  }
  
  /* change directory to parent directory */
+ /* ARGSUSED */
  void
  cdup(int argc, char *argv[])
  {
***************
*** 1940,1945 ****
--- 1944,1950 ----
  /* 
   * Show remote system type
   */
+ /* ARGSUSED */
  void
  syst(int argc, char *argv[])
  {