Module Name: src
Committed By: christos
Date: Sat Oct 22 22:02:55 UTC 2016
Modified Files:
src/usr.bin/systat: cmds.c extern.h main.c
Log Message:
allow fractional intervals
To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 src/usr.bin/systat/cmds.c
cvs rdiff -u -r1.45 -r1.46 src/usr.bin/systat/extern.h
cvs rdiff -u -r1.49 -r1.50 src/usr.bin/systat/main.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/systat/cmds.c
diff -u src/usr.bin/systat/cmds.c:1.29 src/usr.bin/systat/cmds.c:1.30
--- src/usr.bin/systat/cmds.c:1.29 Tue Aug 2 11:56:09 2016
+++ src/usr.bin/systat/cmds.c Sat Oct 22 18:02:55 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: cmds.c,v 1.29 2016/08/02 15:56:09 scole Exp $ */
+/* $NetBSD: cmds.c,v 1.30 2016/10/22 22:02:55 christos Exp $ */
/*-
* Copyright (c) 1980, 1992, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)cmds.c 8.2 (Berkeley) 4/29/95";
#endif
-__RCSID("$NetBSD: cmds.c,v 1.29 2016/08/02 15:56:09 scole Exp $");
+__RCSID("$NetBSD: cmds.c,v 1.30 2016/10/22 22:02:55 christos Exp $");
#endif /* not lint */
#include <ctype.h>
@@ -150,7 +150,7 @@ switch_mode(struct mode *p)
void
status(void)
{
- error("Showing %s, refresh every %d seconds.", curmode->c_name, naptime);
+ error("Showing %s, refresh every %g seconds.", curmode->c_name, naptime);
}
int
Index: src/usr.bin/systat/extern.h
diff -u src/usr.bin/systat/extern.h:1.45 src/usr.bin/systat/extern.h:1.46
--- src/usr.bin/systat/extern.h:1.45 Tue Aug 2 11:56:09 2016
+++ src/usr.bin/systat/extern.h Sat Oct 22 18:02:55 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: extern.h,v 1.45 2016/08/02 15:56:09 scole Exp $ */
+/* $NetBSD: extern.h,v 1.46 2016/10/22 22:02:55 christos Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -50,7 +50,7 @@ extern kvm_t *kd;
extern long ntext, textp;
extern int CMDLINE;
extern int hz, stathz, maxslp;
-extern int naptime;
+extern double naptime;
extern int nhosts;
extern int nports;
extern int protos;
Index: src/usr.bin/systat/main.c
diff -u src/usr.bin/systat/main.c:1.49 src/usr.bin/systat/main.c:1.50
--- src/usr.bin/systat/main.c:1.49 Sun Aug 23 14:33:15 2015
+++ src/usr.bin/systat/main.c Sat Oct 22 18:02:55 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.49 2015/08/23 18:33:15 mrg Exp $ */
+/* $NetBSD: main.c,v 1.50 2016/10/22 22:02:55 christos Exp $ */
/*-
* Copyright (c) 1980, 1992, 1993
@@ -36,7 +36,7 @@ __COPYRIGHT("@(#) Copyright (c) 1980, 19
#if 0
static char sccsid[] = "@(#)main.c 8.1 (Berkeley) 6/6/93";
#endif
-__RCSID("$NetBSD: main.c,v 1.49 2015/08/23 18:33:15 mrg Exp $");
+__RCSID("$NetBSD: main.c,v 1.50 2016/10/22 22:02:55 christos Exp $");
#endif /* not lint */
#include <sys/param.h>
@@ -66,7 +66,7 @@ char *nlistf = NULL;
sig_t sigtstpdfl;
double avenrun[3];
int col;
-int naptime = 5;
+double naptime = 5;
int verbose = 1; /* to report kvm read errs */
int hz, stathz, maxslp;
char c;
@@ -113,7 +113,7 @@ main(int argc, char **argv)
nflag = !nflag;
break;
case 'w':
- if ((naptime = atoi(optarg)) <= 0)
+ if ((naptime = strtod(optarg, NULL)) <= 0)
errx(1, "interval <= 0.");
break;
case 't':
@@ -133,7 +133,7 @@ main(int argc, char **argv)
int modefound = 0;
if (isdigit((unsigned char)argv[0][0])) {
- naptime = atoi(argv[0]);
+ naptime = strtod(argv[0], NULL);
if (naptime <= 0)
naptime = 5;
continue;
