===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/vmstat/dkstats.c,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- src/usr.bin/vmstat/dkstats.c	2010/07/20 19:43:19	1.34
+++ src/usr.bin/vmstat/dkstats.c	2010/09/24 00:11:15	1.35
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dkstats.c,v 1.34 2010/07/20 19:43:19 lum Exp $	*/
+/*	$OpenBSD: dkstats.c,v 1.35 2010/09/24 00:11:15 deraadt Exp $	*/
 /*	$NetBSD: dkstats.c,v 1.1 1996/05/10 23:19:27 thorpej Exp $	*/
 
 /*
@@ -198,8 +198,14 @@
 			if (sysctl(mib, 2, disknames, &size, NULL, 0) < 0)
 				err(1, "can't get hw.disknames");
 			bufpp = disknames;
-			for (i = 0; i < dk_ndrive && (name = strsep(&bufpp, ",")) != NULL; i++)
+			for (i = 0; i < dk_ndrive &&
+			    (name = strsep(&bufpp, ",")) != NULL; i++)
 				dk_name[i] = name;
+			for (i = 0; i < dk_ndrive; i++) {
+				char *p = strchr(dk_name[i], ':');
+				if (p)
+					*p = '\0';
+			}
 			disknames = cur.dk_name[0];	/* To free old names. */
 
 			if (dk_ndrive < cur.dk_ndrive) {
@@ -527,6 +533,11 @@
 		for (i = 0; i < dk_ndrive && (name = strsep(&bufpp, ",")) != NULL; i++) {
 			cur.dk_name[i] = name;
 			cur.dk_select[i] = sel;
+		}
+		for (i = 0; i < dk_ndrive; i++) {
+			char *p = strchr(cur.dk_name[i], ':');
+			if (p)
+				*p = '\0';
 		}
 	} else {
 #if !defined(NOKVM)