===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/telnet/commands.c,v
retrieving revision 1.38
retrieving revision 1.39
diff -c -r1.38 -r1.39
*** src/usr.bin/telnet/commands.c	2001/09/03 05:28:51	1.38
--- src/usr.bin/telnet/commands.c	2001/11/19 19:02:16	1.39
***************
*** 1,4 ****
! /*	$OpenBSD: commands.c,v 1.38 2001/09/03 05:28:51 itojun Exp $	*/
  /*	$NetBSD: commands.c,v 1.14 1996/03/24 22:03:48 jtk Exp $	*/
  
  /*
--- 1,4 ----
! /*	$OpenBSD: commands.c,v 1.39 2001/11/19 19:02:16 mpech Exp $	*/
  /*	$NetBSD: commands.c,v 1.14 1996/03/24 22:03:48 jtk Exp $	*/
  
  /*
***************
*** 95,102 ****
      static void
  makeargv()
  {
!     register char *cp, *cp2, c;
!     register char **argp = margv;
  
      margc = 0;
      cp = line;
--- 95,102 ----
      static void
  makeargv()
  {
!     char *cp, *cp2, c;
!     char **argp = margv;
  
      margc = 0;
      cp = line;
***************
*** 107,113 ****
  	cp++;
      }
      while ((c = *cp)) {
! 	register int inquote = 0;
  	while (isspace(c))
  	    c = *++cp;
  	if (c == '\0')
--- 107,113 ----
  	cp++;
      }
      while ((c = *cp)) {
! 	int inquote = 0;
  	while (isspace(c))
  	    c = *++cp;
  	if (c == '\0')
***************
*** 151,159 ****
  
  	static char
  special(s)
! 	register char *s;
  {
! 	register char c;
  	char b;
  
  	switch (*s) {
--- 151,159 ----
  
  	static char
  special(s)
! 	char *s;
  {
! 	char c;
  	char b;
  
  	switch (*s) {
***************
*** 178,184 ****
   */
  	static char *
  control(c)
! 	register cc_t c;
  {
  	static char buf[5];
  	/*
--- 178,184 ----
   */
  	static char *
  control(c)
! 	cc_t c;
  {
  	static char buf[5];
  	/*
***************
*** 188,194 ****
  	 * was to assign "c" to an unsigned int variable...
  	 * Arggg....
  	 */
! 	register unsigned int uic = (unsigned int)c;
  
  	if (uic == 0x7f)
  		return ("^?");
--- 188,194 ----
  	 * was to assign "c" to an unsigned int variable...
  	 * Arggg....
  	 */
! 	unsigned int uic = (unsigned int)c;
  
  	if (uic == 0x7f)
  		return ("^?");
***************
*** 397,406 ****
  {
      char **cpp;
      extern char *telopts[];
!     register int val = 0;
  
      if (isprefix(name, "help") || isprefix(name, "?")) {
! 	register int col, len;
  
  	printf("Usage: send %s <value|option>\r\n", cmd);
  	printf("\"value\" must be from 0 to 255\r\n");
--- 397,406 ----
  {
      char **cpp;
      extern char *telopts[];
!     int val = 0;
  
      if (isprefix(name, "help") || isprefix(name, "?")) {
! 	int col, len;
  
  	printf("Usage: send %s <value|option>\r\n", cmd);
  	printf("\"value\" must be from 0 to 255\r\n");
***************
*** 428,434 ****
      if (cpp) {
  	val = cpp - telopts;
      } else {
! 	register char *cp = name;
  
  	while (*cp >= '0' && *cp <= '9') {
  	    val *= 10;
--- 428,434 ----
      if (cpp) {
  	val = cpp - telopts;
      } else {
! 	char *cp = name;
  
  	while (*cp >= '0' && *cp <= '9') {
  	    val *= 10;
***************
*** 988,994 ****
  {
      struct setlist *ct;
      struct togglelist *c;
!     register char *name;
  
      if (argc < 2) {
  	fprintf(stderr,
--- 988,994 ----
  {
      struct setlist *ct;
      struct togglelist *c;
!     char *name;
  
      if (argc < 2) {
  	fprintf(stderr,
***************
*** 1287,1293 ****
  	int argc;
  	char *argv[];
  {
! 	register char *arg;
  	char buf[50];
  
  	printf(
--- 1287,1293 ----
  	int argc;
  	char *argv[];
  {
! 	char *arg;
  	char buf[50];
  
  	printf(
***************
*** 1372,1378 ****
  	    /*
  	     * Fire up the shell in the child.
  	     */
! 	    register char *shellp, *shellname;
  
  	    shellp = getenv("SHELL");
  	    if (shellp == NULL)
--- 1372,1378 ----
  	    /*
  	     * Fire up the shell in the child.
  	     */
! 	    char *shellp, *shellname;
  
  	    shellp = getenv("SHELL");
  	    if (shellp == NULL)
***************
*** 1634,1640 ****
  env_find(var)
  	unsigned char *var;
  {
! 	register struct env_lst *ep;
  
  	for (ep = envlisthead.next; ep; ep = ep->next) {
  		if (strcmp((char *)ep->var, (char *)var) == 0)
--- 1634,1640 ----
  env_find(var)
  	unsigned char *var;
  {
! 	struct env_lst *ep;
  
  	for (ep = envlisthead.next; ep; ep = ep->next) {
  		if (strcmp((char *)ep->var, (char *)var) == 0)
***************
*** 1705,1711 ****
  env_define(var, value)
  	unsigned char *var, *value;
  {
! 	register struct env_lst *ep;
  
  	if ((ep = env_find(var))) {
  		if (ep->var)
--- 1705,1711 ----
  env_define(var, value)
  	unsigned char *var, *value;
  {
! 	struct env_lst *ep;
  
  	if ((ep = env_find(var))) {
  		if (ep->var)
***************
*** 1734,1740 ****
  env_undefine(var)
  	unsigned char *var;
  {
! 	register struct env_lst *ep;
  
  	if ((ep = env_find(var))) {
  		ep->prev->next = ep->next;
--- 1734,1740 ----
  env_undefine(var)
  	unsigned char *var;
  {
! 	struct env_lst *ep;
  
  	if ((ep = env_find(var))) {
  		ep->prev->next = ep->next;
***************
*** 1752,1758 ****
  env_export(var)
  	unsigned char *var;
  {
! 	register struct env_lst *ep;
  
  	if ((ep = env_find(var)))
  		ep->export = 1;
--- 1752,1758 ----
  env_export(var)
  	unsigned char *var;
  {
! 	struct env_lst *ep;
  
  	if ((ep = env_find(var)))
  		ep->export = 1;
***************
*** 1762,1768 ****
  env_unexport(var)
  	unsigned char *var;
  {
! 	register struct env_lst *ep;
  
  	if ((ep = env_find(var)) != NULL)
  		ep->export = 0;
--- 1762,1768 ----
  env_unexport(var)
  	unsigned char *var;
  {
! 	struct env_lst *ep;
  
  	if ((ep = env_find(var)) != NULL)
  		ep->export = 0;
***************
*** 1772,1778 ****
  env_send(var)
  	unsigned char *var;
  {
! 	register struct env_lst *ep;
  
  	if (my_state_is_wont(TELOPT_NEW_ENVIRON)
  #ifdef	OLD_ENVIRON
--- 1772,1778 ----
  env_send(var)
  	unsigned char *var;
  {
! 	struct env_lst *ep;
  
  	if (my_state_is_wont(TELOPT_NEW_ENVIRON)
  #ifdef	OLD_ENVIRON
***************
*** 1798,1804 ****
  	void
  env_list()
  {
! 	register struct env_lst *ep;
  
  	for (ep = envlisthead.next; ep; ep = ep->next) {
  		printf("%c %-20s %s\r\n", ep->export ? '*' : ' ',
--- 1798,1804 ----
  	void
  env_list()
  {
! 	struct env_lst *ep;
  
  	for (ep = envlisthead.next; ep; ep = ep->next) {
  		printf("%c %-20s %s\r\n", ep->export ? '*' : ' ',
***************
*** 1829,1835 ****
  env_getvalue(var)
  	unsigned char *var;
  {
! 	register struct env_lst *ep;
  
  	if ((ep = env_find(var)))
  		return(ep->value);
--- 1829,1835 ----
  env_getvalue(var)
  	unsigned char *var;
  {
! 	struct env_lst *ep;
  
  	if ((ep = env_find(var)))
  		return(ep->value);
***************
*** 2622,2628 ****
      char *tbuf;
      int cnt;
  {
!     register Command *c;
  
      setcommandmode();
      if (!top) {
--- 2622,2628 ----
      char *tbuf;
      int cnt;
  {
!     Command *c;
  
      setcommandmode();
      if (!top) {
***************
*** 2637,2643 ****
  	if (rlogin == _POSIX_VDISABLE)
  		printf("%s> ", prompt);
  	if (tbuf) {
! 	    register char *cp;
  	    cp = line;
  	    while (cnt > 0 && (*cp++ = *tbuf++) != '\n')
  		cnt--;
--- 2637,2643 ----
  	if (rlogin == _POSIX_VDISABLE)
  		printf("%s> ", prompt);
  	if (tbuf) {
! 	    char *cp;
  	    cp = line;
  	    while (cnt > 0 && (*cp++ = *tbuf++) != '\n')
  		cnt--;
***************
*** 2705,2711 ****
  	int argc;
  	char *argv[];
  {
! 	register Command *c;
  
  	if (argc == 1) {
  		printf("Commands may be abbreviated.  Commands are:\r\n\r\n");
--- 2705,2711 ----
  	int argc;
  	char *argv[];
  {
! 	Command *c;
  
  	if (argc == 1) {
  		printf("Commands may be abbreviated.  Commands are:\r\n\r\n");
***************
*** 2717,2723 ****
  		return 0;
  	}
  	while (--argc > 0) {
! 		register char *arg;
  		arg = *++argv;
  		c = getcmd(arg);
  		if (Ambiguous(c))
--- 2717,2723 ----
  		return 0;
  	}
  	while (--argc > 0) {
! 		char *arg;
  		arg = *++argv;
  		c = getcmd(arg);
  		if (Ambiguous(c))
***************
*** 2782,2791 ****
  	static IOPTN ipopt;
  #endif
  	char *cp, *cp2, *lsrp, *lsrep;
! 	register int tmp;
  	struct in_addr sin_addr;
! 	register struct hostent *host = 0;
! 	register char c;
  
  	/*
  	 * Verify the arguments, and make sure we have
--- 2782,2791 ----
  	static IOPTN ipopt;
  #endif
  	char *cp, *cp2, *lsrp, *lsrep;
! 	int tmp;
  	struct in_addr sin_addr;
! 	struct hostent *host = 0;
! 	char c;
  
  	/*
  	 * Verify the arguments, and make sure we have