===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/procname.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- src/usr.bin/tmux/procname.c	2009/12/24 22:29:15	1.6
+++ src/usr.bin/tmux/procname.c	2011/04/10 03:20:59	1.7
@@ -1,4 +1,4 @@
-/* $OpenBSD: procname.c,v 1.6 2009/12/24 22:29:15 guenther Exp $ */
+/* $OpenBSD: procname.c,v 1.7 2011/04/10 03:20:59 guenther Exp $ */
 
 /*
  * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -34,11 +34,11 @@
 #define is_stopped(p) \
 	((p)->p_stat == SSTOP || (p)->p_stat == SZOMB || (p)->p_stat == SDEAD)
 
-struct kinfo_proc2	*cmp_procs(struct kinfo_proc2 *, struct kinfo_proc2 *);
+struct kinfo_proc	*cmp_procs(struct kinfo_proc *, struct kinfo_proc *);
 char		*get_proc_name(int, char *);
 
-struct kinfo_proc2 *
-cmp_procs(struct kinfo_proc2 *p1, struct kinfo_proc2 *p2)
+struct kinfo_proc *
+cmp_procs(struct kinfo_proc *p1, struct kinfo_proc *p2)
 {
 	if (is_runnable(p1) && !is_runnable(p2))
 		return (p1);
@@ -78,11 +78,11 @@
 char *
 get_proc_name(int fd, char *tty)
 {
-	int		 mib[6] = { CTL_KERN, KERN_PROC2, KERN_PROC_PGRP, 0,
-				    sizeof(struct kinfo_proc2), 0 };
+	int		 mib[6] = { CTL_KERN, KERN_PROC, KERN_PROC_PGRP, 0,
+				    sizeof(struct kinfo_proc), 0 };
 	struct stat	 sb;
 	size_t		 len;
-	struct kinfo_proc2 *buf, *newbuf, *bestp;
+	struct kinfo_proc *buf, *newbuf, *bestp;
 	u_int		 i;
 	char		*name;
 
@@ -102,7 +102,7 @@
 		goto error;
 	buf = newbuf;
 
-	mib[5] = (int)(len / sizeof(struct kinfo_proc2));
+	mib[5] = (int)(len / sizeof(struct kinfo_proc));
 	if (sysctl(mib, nitems(mib), buf, &len, NULL, 0) == -1) {
 		if (errno == ENOMEM)
 			goto retry;
@@ -110,7 +110,7 @@
 	}
 
 	bestp = NULL;
-	for (i = 0; i < len / sizeof (struct kinfo_proc2); i++) {
+	for (i = 0; i < len / sizeof (struct kinfo_proc); i++) {
 		if ((dev_t)buf[i].p_tdev != sb.st_rdev)
 			continue;
 		if (bestp == NULL)