===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/nfsstat/nfsstat.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -c -r1.28 -r1.29
*** src/usr.bin/nfsstat/nfsstat.c	2005/08/01 22:28:19	1.28
--- src/usr.bin/nfsstat/nfsstat.c	2006/04/03 06:40:14	1.29
***************
*** 1,4 ****
! /*	$OpenBSD: nfsstat.c,v 1.28 2005/08/01 22:28:19 millert Exp $	*/
  /*	$NetBSD: nfsstat.c,v 1.7 1996/03/03 17:21:30 thorpej Exp $	*/
  
  /*
--- 1,4 ----
! /*	$OpenBSD: nfsstat.c,v 1.29 2006/04/03 06:40:14 deraadt Exp $	*/
  /*	$NetBSD: nfsstat.c,v 1.7 1996/03/03 17:21:30 thorpej Exp $	*/
  
  /*
***************
*** 44,50 ****
  static char sccsid[] = "from: @(#)nfsstat.c	8.1 (Berkeley) 6/6/93";
  static char *rcsid = "$NetBSD: nfsstat.c,v 1.7 1996/03/03 17:21:30 thorpej Exp $";
  #else
! static char *rcsid = "$OpenBSD: nfsstat.c,v 1.28 2005/08/01 22:28:19 millert Exp $";
  #endif
  #endif /* not lint */
  
--- 44,50 ----
  static char sccsid[] = "from: @(#)nfsstat.c	8.1 (Berkeley) 6/6/93";
  static char *rcsid = "$NetBSD: nfsstat.c,v 1.7 1996/03/03 17:21:30 thorpej Exp $";
  #else
! static char *rcsid = "$OpenBSD: nfsstat.c,v 1.29 2006/04/03 06:40:14 deraadt Exp $";
  #endif
  #endif /* not lint */
  
***************
*** 91,102 ****
  int
  main(int argc, char *argv[])
  {
  	extern int optind;
  	extern char *optarg;
- 	char *p;
- 	u_int interval;
- 	u_int display = SHOW_ALL;
  	char *memf, *nlistf;
  	int ch;
  
  	interval = 0;
--- 91,101 ----
  int
  main(int argc, char *argv[])
  {
+ 	u_int interval, display = SHOW_ALL;
  	extern int optind;
  	extern char *optarg;
  	char *memf, *nlistf;
+ 	const char *errstr;
  	int ch;
  
  	interval = 0;
***************
*** 110,118 ****
  			nlistf = optarg;
  			break;
  		case 'w':
! 			interval = (u_int)strtol(optarg, &p, 0);
! 			if (*optarg == '\0' || *p != '\0')
! 				errx(1, "invalid interval");
  			break;
  		case 's':
  			display = SHOW_SERVER;
--- 109,118 ----
  			nlistf = optarg;
  			break;
  		case 'w':
! 			interval = (u_int)strtonum(optarg, 0, 1000, &errstr);
! 			if (errstr)
! 				errx(1, "invalid interval %s: %s",
! 				    optarg, errstr);
  			break;
  		case 's':
  			display = SHOW_SERVER;
***************
*** 130,136 ****
  #define	BACKWARD_COMPATIBILITY
  #ifdef	BACKWARD_COMPATIBILITY
  	if (*argv) {
! 		interval = atoi(*argv);
  		if (*++argv) {
  			nlistf = *argv;
  			if (*++argv)
--- 130,138 ----
  #define	BACKWARD_COMPATIBILITY
  #ifdef	BACKWARD_COMPATIBILITY
  	if (*argv) {
! 		interval = (u_int)strtonum(*argv, 0, 1000, &errstr);
! 		if (errstr)
! 			errx(1, "invalid interval %s: %s", *argv, errstr);
  		if (*++argv) {
  			nlistf = *argv;
  			if (*++argv)
***************
*** 356,362 ****
  	(void)signal(SIGALRM, catchalarm);
  	signalled = 0;
  	(void)alarm(interval);
! 	bzero((caddr_t)&lastst, sizeof(lastst));
  
  	for (hdrcnt = 1;;) {
  		if (!--hdrcnt) {
--- 358,364 ----
  	(void)signal(SIGALRM, catchalarm);
  	signalled = 0;
  	(void)alarm(interval);
! 	bzero(&lastst, sizeof(lastst));
  
  	for (hdrcnt = 1;;) {
  		if (!--hdrcnt) {