===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/telnet/commands.c,v
retrieving revision 1.66
retrieving revision 1.67
diff -c -r1.66 -r1.67
*** src/usr.bin/telnet/commands.c	2014/07/20 10:18:10	1.66
--- src/usr.bin/telnet/commands.c	2014/07/20 10:55:26	1.67
***************
*** 1,4 ****
! /*	$OpenBSD: commands.c,v 1.66 2014/07/20 10:18:10 guenther Exp $	*/
  /*	$NetBSD: commands.c,v 1.14 1996/03/24 22:03:48 jtk Exp $	*/
  
  /*
--- 1,4 ----
! /*	$OpenBSD: commands.c,v 1.67 2014/07/20 10:55:26 guenther Exp $	*/
  /*	$NetBSD: commands.c,v 1.14 1996/03/24 22:03:48 jtk Exp $	*/
  
  /*
***************
*** 54,59 ****
--- 54,60 ----
  
  typedef int (*intrtn_t)(int, char**);
  static int call(intrtn_t, ...);
+ static unsigned long sourceroute(char *arg, char **cpp, int *lenp);
  
  typedef struct {
  	char	*name;		/* command name */
***************
*** 1341,1347 ****
      if (connected) {
  	(void) shutdown(net, 2);
  	printf("Connection closed.\r\n");
! 	(void) NetClose(net);
  	connected = 0;
  	resettermname = 1;
  	/* reset options */
--- 1342,1348 ----
      if (connected) {
  	(void) shutdown(net, 2);
  	printf("Connection closed.\r\n");
! 	(void)close(net);
  	connected = 0;
  	resettermname = 1;
  	/* reset options */
***************
*** 1462,1467 ****
--- 1463,1474 ----
  };
  
  static void	env_help(void);
+ static void	env_undefine(unsigned char *);
+ static void	env_export(unsigned char *);
+ static void	env_unexport(unsigned char *);
+ static void	env_send(unsigned char *);
+ static void	env_list(void);
+ static struct env_lst *env_find(unsigned char *var);
  
  struct envlist EnvList[] = {
      { "define",	"Define an environment variable",
***************
*** 1480,1486 ****
      { 0 },
  };
  
!     static void
  env_help()
  {
      struct envlist *c;
--- 1487,1493 ----
      { 0 },
  };
  
! static void
  env_help()
  {
      struct envlist *c;
***************
*** 1495,1501 ****
      }
  }
  
!     static struct envlist *
  getenvcmd(name)
      char *name;
  {
--- 1502,1508 ----
      }
  }
  
! static struct envlist *
  getenvcmd(name)
      char *name;
  {
***************
*** 1503,1509 ****
  		genget(name, (char **) EnvList, sizeof(struct envlist));
  }
  
!     int
  env_cmd(argc, argv)
      int  argc;
      char *argv[];
--- 1510,1516 ----
  		genget(name, (char **) EnvList, sizeof(struct envlist));
  }
  
! static int
  env_cmd(argc, argv)
      int  argc;
      char *argv[];
***************
*** 1548,1554 ****
  
  struct env_lst envlisthead;
  
! 	struct env_lst *
  env_find(var)
  	unsigned char *var;
  {
--- 1555,1561 ----
  
  struct env_lst envlisthead;
  
! static struct env_lst *
  env_find(var)
  	unsigned char *var;
  {
***************
*** 1647,1653 ****
  	return(ep);
  }
  
! 	void
  env_undefine(var)
  	unsigned char *var;
  {
--- 1654,1660 ----
  	return(ep);
  }
  
! static void
  env_undefine(var)
  	unsigned char *var;
  {
***************
*** 1665,1671 ****
  	}
  }
  
! 	void
  env_export(var)
  	unsigned char *var;
  {
--- 1672,1678 ----
  	}
  }
  
! static void
  env_export(var)
  	unsigned char *var;
  {
***************
*** 1675,1681 ****
  		ep->export = 1;
  }
  
! 	void
  env_unexport(var)
  	unsigned char *var;
  {
--- 1682,1688 ----
  		ep->export = 1;
  }
  
! static void
  env_unexport(var)
  	unsigned char *var;
  {
***************
*** 1685,1691 ****
  		ep->export = 0;
  }
  
! 	void
  env_send(var)
  	unsigned char *var;
  {
--- 1692,1698 ----
  		ep->export = 0;
  }
  
! static void
  env_send(var)
  	unsigned char *var;
  {
***************
*** 1709,1715 ****
  	env_opt_end(0);
  }
  
! 	void
  env_list()
  {
  	struct env_lst *ep;
--- 1716,1722 ----
  	env_opt_end(0);
  }
  
! static void
  env_list()
  {
  	struct env_lst *ep;
***************
*** 2109,2115 ****
      (void) call(status, "status", "notmuch", 0);
      if (setjmp(peerdied) == 0)
  	telnet(user);
!     (void) NetClose(net);
      ExitString("Connection closed by foreign host.\r\n",1);
  }
  
--- 2116,2122 ----
      (void) call(status, "status", "notmuch", 0);
      if (setjmp(peerdied) == 0)
  	telnet(user);
!     (void)close(net);
      ExitString("Connection closed by foreign host.\r\n",1);
  }
  
***************
*** 2344,2350 ****
   *		pointed to by *cpp is.
   *
   */
! 	unsigned long
  sourceroute(arg, cpp, lenp)
  	char	*arg;
  	char	**cpp;
--- 2351,2358 ----
   *		pointed to by *cpp is.
   *
   */
! 
! static unsigned long
  sourceroute(arg, cpp, lenp)
  	char	*arg;
  	char	**cpp;