===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/top/display.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -c -r1.31 -r1.32
*** src/usr.bin/top/display.c	2007/11/01 19:10:32	1.31
--- src/usr.bin/top/display.c	2007/11/22 11:01:04	1.32
***************
*** 1,4 ****
! /* $OpenBSD: display.c,v 1.31 2007/11/01 19:10:32 otto Exp $	 */
  
  /*
   *  Top users/processes display for Unix
--- 1,4 ----
! /* $OpenBSD: display.c,v 1.32 2007/11/22 11:01:04 otto Exp $	 */
  
  /*
   *  Top users/processes display for Unix
***************
*** 74,80 ****
  static char    *cpustates_tag(int);
  static int      string_count(char **);
  static void     summary_format(char *, size_t, int *, char **);
! static int	readlinedumb(char *, int, int);
  
  #define lineindex(l) ((l)*display_width)
  
--- 74,80 ----
  static char    *cpustates_tag(int);
  static int      string_count(char **);
  static void     summary_format(char *, size_t, int *, char **);
! static int	readlinedumb(char *, int);
  
  #define lineindex(l) ((l)*display_width)
  
***************
*** 559,565 ****
  
  
  static int
! readlinedumb(char *buffer, int size, int numeric)
  {
  	char *ptr = buffer, ch, cnt = 0, maxcnt = 0;
  	extern volatile sig_atomic_t leaveflag;
--- 559,565 ----
  
  
  static int
! readlinedumb(char *buffer, int size)
  {
  	char *ptr = buffer, ch, cnt = 0, maxcnt = 0;
  	extern volatile sig_atomic_t leaveflag;
***************
*** 600,607 ****
  			}
  		}
  		/* check for character validity and buffer overflow */
! 		else if (cnt == size || (numeric && !isdigit(ch)) ||
! 		    !isprint(ch)) {
  			/* not legal */
  			if (putchar('\7') == EOF)
  				exit(1);
--- 600,606 ----
  			}
  		}
  		/* check for character validity and buffer overflow */
! 		else if (cnt == size || !isprint(ch)) {
  			/* not legal */
  			if (putchar('\7') == EOF)
  				exit(1);
***************
*** 621,631 ****
  
  	/* return either inputted number or string length */
  	putr();
! 	return (cnt == 0 ? -1 : numeric ? atoi(buffer) : cnt);
  }
  
  int
! readline(char *buffer, int size, int numeric)
  {
  	size_t cnt;
  
--- 620,630 ----
  
  	/* return either inputted number or string length */
  	putr();
! 	return (cnt == 0 ? -1 : cnt);
  }
  
  int
! readline(char *buffer, int size)
  {
  	size_t cnt;
  
***************
*** 635,646 ****
  	if (smart_terminal)
  		getnstr(buffer, size);
  	else
! 		return readlinedumb(buffer, size, numeric);
  
  	cnt = strlen(buffer);
  	if (cnt > 0 && buffer[cnt - 1] == '\n')
  		buffer[cnt - 1] = '\0';
! 	return (cnt == 0 ? -1 : numeric ? atoi(buffer) : cnt);
  }
  
  /* internal support routines */
--- 634,645 ----
  	if (smart_terminal)
  		getnstr(buffer, size);
  	else
! 		return readlinedumb(buffer, size);
  
  	cnt = strlen(buffer);
  	if (cnt > 0 && buffer[cnt - 1] == '\n')
  		buffer[cnt - 1] = '\0';
! 	return (cnt == 0 ? -1 : cnt);
  }
  
  /* internal support routines */