Apparently NetBSD's tcgetpgrp is good enough to use, so don't need to play

complicated games, from Roy Marples.

1 files changed, 13 insertions, 81 deletions

diff --git a/osdep-netbsd.c b/osdep-netbsd.c
index 2102277a..be9cba1b 100644
--- a/osdep-netbsd.c
+++ b/osdep-netbsd.c
@@ -1,3 +1,5 @@
+/* $Id: osdep-netbsd.c,v 1.4 2009-06-26 15:54:52 nicm Exp $ */
+
 /*
  * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
  *
@@ -16,13 +18,8 @@
 
 #include <sys/param.h>
 #include <sys/proc.h>
-#include <sys/stat.h>
 #include <sys/sysctl.h>
-#include <sys/user.h>
 
-#include <errno.h>
-#include <stdint.h>
-#include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 
@@ -30,91 +27,26 @@
 #define nitems(_a) (sizeof((_a)) / sizeof((_a)[0]))
 #endif
 
-#define is_runnable(p) \
-	((p)->p_stat == LSRUN || (p)->p_stat == SIDL)
-#define is_stopped(p) \
-	((p)->p_stat == LSSTOP || (p)->p_stat == SZOMB)
-
 char	*osdep_get_name(int, char *);
 
 char *
-osdep_get_name(int fd, char *tty)
+osdep_get_name(int fd, __unused char *tty)
 {
-	int		 mib[4] = { CTL_KERN, KERN_PROC2, KERN_PROC_PGRP, 0 };
-	struct stat	 sb;
+	int		 mib[6];
 	size_t		 len;
-	struct kinfo_proc2 *buf, *newbuf, *p, *bestp;
-	u_int		 i;
-	char		*name;
+	struct kinfo_proc2 p;
 
-	buf = NULL;
-
-	if (stat(tty, &sb) == -1)
-		return (NULL);
 	if ((mib[3] = tcgetpgrp(fd)) == -1)
 		return (NULL);
 
-retry:
-	if (sysctl(mib, nitems(mib), NULL, &len, NULL, 0) == -1)
-		return (NULL);
-	len = (len * 5) / 4;
-
-	if ((newbuf = realloc(buf, len)) == NULL) {
-		free(buf);
-		return (NULL);
-	}
-	buf = newbuf;
-
-	if (sysctl(mib, nitems(mib), buf, &len, NULL, 0) == -1) {
-		if (errno == ENOMEM)
-			goto retry;
-		free(buf);
+	len = sizeof(p);
+	mib[0] = CTL_KERN;
+	mib[1] = KERN_PROC2;
+	mib[2] = KERN_PROC_PID;
+	mib[4] = sizeof(p);
+	mib[5] = 1;
+	if (sysctl(mib, nitems(mib), &p, &len, NULL, 0) == -1)
 		return (NULL);
-	}
-
-	bestp = NULL;
-	for (i = 0; i < len / sizeof (struct kinfo_proc); i++) {
-		if (buf[i].p_tdev != sb.st_rdev)
-			continue;
-		p = &buf[i];
-		if (bestp == NULL) {
-			bestp = p;
-			continue;
-		}
-
-		if (is_runnable(p) && !is_runnable(bestp))
-			bestp = p;
-		else if (!is_runnable(p) && is_runnable(bestp))
-			continue;
-
-		if (!is_stopped(p) && is_stopped(bestp))
-			bestp = p;
-		else if (is_stopped(p) && !is_stopped(bestp))
-			continue;
-
-		if (p->p_estcpu > bestp->p_estcpu)
-			bestp = p;
-		else if (p->p_estcpu < bestp->p_estcpu)
-			continue;
-
-		if (p->p_slptime < bestp->p_slptime)
-			bestp = p;
-		else if (p->p_slptime > bestp->p_slptime)
-			continue;
-
-		if (strcmp(p->p_comm, p->p_comm) < 0)
-			bestp = p;
-		else if (strcmp(p->p_comm, p->p_comm) > 0)
-			continue;
-
-		if (p->p_pid > bestp->p_pid)
-			bestp = p;
-	}
-
-	name = NULL;
-	if (bestp != NULL)
-		name = strdup(bestp->p_comm);
 
-	free(buf);
-	return (name);
+	return (strdup(p.p_comm));
 }