===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/telnet/commands.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -c -r1.14 -r1.15
*** src/usr.bin/telnet/commands.c	1998/05/15 01:26:09	1.14
--- src/usr.bin/telnet/commands.c	1998/05/15 03:16:35	1.15
***************
*** 1,4 ****
! /*	$OpenBSD: commands.c,v 1.14 1998/05/15 01:26:09 art Exp $	*/
  /*	$NetBSD: commands.c,v 1.14 1996/03/24 22:03:48 jtk Exp $	*/
  
  /*
--- 1,4 ----
! /*	$OpenBSD: commands.c,v 1.15 1998/05/15 03:16:35 art Exp $	*/
  /*	$NetBSD: commands.c,v 1.14 1996/03/24 22:03:48 jtk Exp $	*/
  
  /*
***************
*** 35,40 ****
--- 35,41 ----
   */
  
  #include "telnet_locl.h"
+ #include <err.h>
  
  #if	defined(IPPROTO_IP) && defined(IP_TOS)
  int tos = -1;
***************
*** 70,76 ****
  
  	if(argc != 3) {
  		printf("%s sequence challenge\n", argv[0]);
! 		return;
  	}
  
  	switch(fork()) {
--- 71,77 ----
  
  	if(argc != 3) {
  		printf("%s sequence challenge\n", argv[0]);
! 		return 0;
  	}
  
  	switch(fork()) {
***************
*** 78,84 ****
  		execv(PATH_SKEY, argv);
  		exit (1);
  	case -1:
! 		perror("fork");
  		break;
  	default:
  		(void) wait(&status);
--- 79,85 ----
  		execv(PATH_SKEY, argv);
  		exit (1);
  	case -1:
! 		err(1, "fork");
  		break;
  	default:
  		(void) wait(&status);
***************
*** 148,154 ****
   * Todo:  1.  Could take random integers (12, 0x12, 012, 0b1).
   */
  
! 	static
  special(s)
  	register char *s;
  {
--- 149,155 ----
   * Todo:  1.  Could take random integers (12, 0x12, 012, 0b1).
   */
  
! 	static char
  special(s)
  	register char *s;
  {
***************
*** 1403,1409 ****
  #endif	/* !defined(TN3270) */
  
      /*VARARGS*/
!     static
  bye(argc, argv)
      int  argc;		/* Number of arguments */
      char *argv[];	/* arguments */
--- 1404,1410 ----
  #endif	/* !defined(TN3270) */
  
      /*VARARGS*/
!     static int
  bye(argc, argv)
      int  argc;		/* Number of arguments */
      char *argv[];	/* arguments */
***************
*** 1499,1505 ****
  		genget(name, (char **) SlcList, sizeof(struct slclist));
  }
  
!     static
  slccmd(argc, argv)
      int  argc;
      char *argv[];
--- 1500,1506 ----
  		genget(name, (char **) SlcList, sizeof(struct slclist));
  }
  
!     static int
  slccmd(argc, argv)
      int  argc;
      char *argv[];
***************
*** 1584,1589 ****
--- 1585,1591 ----
  		genget(name, (char **) EnvList, sizeof(struct envlist));
  }
  
+     int
  env_cmd(argc, argv)
      int  argc;
      char *argv[];
***************
*** 1763,1769 ****
  {
  	register struct env_lst *ep;
  
! 	if (ep = env_find(var))
  		ep->export = 0;
  }
  
--- 1765,1771 ----
  {
  	register struct env_lst *ep;
  
! 	if ((ep = env_find(var)) != NULL)
  		ep->export = 0;
  }
  
***************
*** 1916,1921 ****
--- 1918,1924 ----
      return 0;
  }
  
+     int
  auth_cmd(argc, argv)
      int  argc;
      char *argv[];
***************
*** 2097,2103 ****
   * Print status about the connection.
   */
      /*ARGSUSED*/
!     static
  status(argc, argv)
      int	 argc;
      char *argv[];
--- 2100,2106 ----
   * Print status about the connection.
   */
      /*ARGSUSED*/
!     static int
  status(argc, argv)
      int	 argc;
      char *argv[];
***************
*** 2604,2611 ****
  
  	user = getenv("USER");
  	if (user == NULL ||
! 	    (pw = getpwnam(user)) && pw->pw_uid != getuid()) {
! 		if (pw = getpwuid(getuid()))
  			user = pw->pw_name;
  		else
  			user = NULL;
--- 2607,2614 ----
  
  	user = getenv("USER");
  	if (user == NULL ||
! 	    ((pw = getpwnam(user)) && pw->pw_uid != getuid())) {
! 		if ((pw = getpwuid(getuid())) != NULL)
  			user = pw->pw_name;
  		else
  			user = NULL;
***************
*** 2817,2823 ****
  /*
   * Help command.
   */
! 	static
  help(argc, argv)
  	int argc;
  	char *argv[];
--- 2820,2826 ----
  /*
   * Help command.
   */
! 	static int
  help(argc, argv)
  	int argc;
  	char *argv[];
***************
*** 2846,2854 ****
  	}
  	return 0;
  }
- 
- static char *rcname = 0;
- static char rcbuf[128];
  
  #if	defined(IP_OPTIONS) && defined(IPPROTO_IP)
  
--- 2849,2854 ----