summaryrefslogtreecommitdiff
path: root/usr.sbin/iostat
diff options
context:
space:
mode:
Diffstat (limited to 'usr.sbin/iostat')
-rw-r--r--usr.sbin/iostat/Makefile12
-rw-r--r--usr.sbin/iostat/iostat.84
-rw-r--r--usr.sbin/iostat/iostat.c12
3 files changed, 14 insertions, 14 deletions
diff --git a/usr.sbin/iostat/Makefile b/usr.sbin/iostat/Makefile
index 0dcd91ce116..3785ba53f38 100644
--- a/usr.sbin/iostat/Makefile
+++ b/usr.sbin/iostat/Makefile
@@ -1,17 +1,17 @@
-# $OpenBSD: Makefile,v 1.2 1996/03/03 02:52:32 tholo Exp $
+# $OpenBSD: Makefile,v 1.3 1996/05/22 11:35:47 deraadt Exp $
# $NetBSD: Makefile,v 1.12 1995/12/22 08:04:27 jonathan Exp $
# from: @(#)Makefile 8.1 (Berkeley) 6/6/93
PROG= iostat
-.if (${MACHINE_ARCH} == "m68k")
-CFLAGS+=-D${MACHINE}
-.endif
+MAN= iostat.8
.PATH: ${.CURDIR}/../../usr.bin/vmstat
-CFLAGS+=-I${.CURDIR}/../../sys/arch -I${.CURDIR}/../../usr.bin/vmstat
+CFLAGS+=-I${.CURDIR}/../../usr.bin/vmstat
+
+# dkstats.c pulled in from ../../usr.bin/vmstat
SRCS= dkstats.c iostat.c
-MAN= iostat.8
+
DPADD= ${LIBKVM}
LDADD= -lkvm
BINGRP= kmem
diff --git a/usr.sbin/iostat/iostat.8 b/usr.sbin/iostat/iostat.8
index 16f27ba1eb0..d2ed7c5ae83 100644
--- a/usr.sbin/iostat/iostat.8
+++ b/usr.sbin/iostat/iostat.8
@@ -1,5 +1,5 @@
-.\" $OpenBSD: iostat.8,v 1.2 1996/03/03 02:52:33 tholo Exp $
-.\" $NetBSD: iostat.8,v 1.8 1995/11/28 20:16:30 thorpej Exp $
+.\" $OpenBSD: iostat.8,v 1.3 1996/05/22 11:35:48 deraadt Exp $
+.\" $NetBSD: iostat.8,v 1.9 1996/05/10 23:20:28 thorpej Exp $
.\"
.\" Copyright (c) 1985, 1991, 1993
.\" The Regents of the University of California. All rights reserved.
diff --git a/usr.sbin/iostat/iostat.c b/usr.sbin/iostat/iostat.c
index a9313ed3b47..ab6026f60bf 100644
--- a/usr.sbin/iostat/iostat.c
+++ b/usr.sbin/iostat/iostat.c
@@ -1,8 +1,8 @@
-/* $OpenBSD: iostat.c,v 1.2 1996/03/03 02:52:34 tholo Exp $ */
-/* $NetBSD: iostat.c,v 1.8 1995/11/28 20:16:31 thorpej Exp $ */
+/* $OpenBSD: iostat.c,v 1.3 1996/05/22 11:35:49 deraadt Exp $ */
+/* $NetBSD: iostat.c,v 1.9 1996/05/10 23:20:29 thorpej Exp $ */
/*
- * Copyright (c) 1996 John M. Vinopal (banshee@resort.com)
+ * Copyright (c) 1996 John M. Vinopal
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -76,7 +76,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)iostat.c 8.2 (Berkeley) 1/26/94";
#else
-static char *rcsid = "$NetBSD: iostat.c,v 1.8 1995/11/28 20:16:31 thorpej Exp $"
+static char *rcsid = "$NetBSD: iostat.c,v 1.9 1996/05/10 23:20:29 thorpej Exp $"
;
#endif
#endif /* not lint */
@@ -98,8 +98,8 @@ static char *rcsid = "$NetBSD: iostat.c,v 1.8 1995/11/28 20:16:31 thorpej Exp $"
extern struct _disk cur;
extern int dk_ndrive;
-char *nlistf = NULL;
-char *memf = NULL;
+/* Namelist and memory files. */
+char *nlistf, *memf;
int hz, reps, interval;
static int todo = 0;