circlecloud
/
tmux
mirror of https://github.com/tmux/tmux.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Tweak selection slightly.

pull/1/head
Nicholas Marriott 2009-01-27 23:10:18 +00:00
parent fbbf46ef71
commit 167178aba4
2 changed files with 29 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
osdep-freebsd.c
View File

@ -1,4 +1,4 @@
/* $Id: osdep-freebsd.c,v 1.3 2009-01-26 22:57:19 nicm Exp $ */
/* $Id: osdep-freebsd.c,v 1.4 2009-01-27 23:10:18 nicm Exp $ */
/*
* Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
@ -72,6 +72,8 @@ retry:
bestp = NULL;
for (i = 0; i < len / sizeof (struct kinfo_proc); i++) {
if (buf[i].ki_tdev != sb.st_rdev)
continue;
p = &buf[i];
if (bestp == NULL)
bestp = p;
@ -84,12 +86,15 @@ retry:
continue;
bestp = p;
}
procname = get_proc_argv0(bestp->ki_pid);
if (procname == NULL || *procname == '\0') {
free(procname);
procname = strdup(bestp->ki_comm);
}
if (bestp != NULL) {
procname = get_proc_argv0(bestp->ki_pid);
if (procname == NULL || *procname == '\0') {
free(procname);
procname = strdup(bestp->ki_comm);
}
} else
procname = NULL;
free(buf);
return (procname);

25
osdep-openbsd.c
View File

@ -1,4 +1,4 @@
/* $Id: osdep-openbsd.c,v 1.5 2009-01-27 21:01:26 nicm Exp $ */
/* $Id: osdep-openbsd.c,v 1.6 2009-01-27 23:10:18 nicm Exp $ */
/*
* Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
@ -70,7 +70,10 @@ retry:
bestp = NULL;
for (i = 0; i < len / sizeof (struct kinfo_proc); i++) {
if (buf[i].kp_eproc.e_tdev != sb.st_rdev)
continue;
p = &buf[i].kp_proc;
//log_debug("XXX %d %s %d %d %d", i, p->p_comm, p->p_stat, p->p_estcpu, p->p_slptime);
if (bestp == NULL)
bestp = p;
@ -82,14 +85,20 @@ retry:
continue;
if (p->p_slptime > bestp->p_slptime)
continue;
if (!(p->p_flag & P_SINTR) && bestp->p_flag & P_SINTR)
continue;
if (p->p_pid < bestp->p_pid)
continue;
bestp = p;
}
procname = get_proc_argv0(bestp->p_pid);
if (procname == NULL || *procname == '\0') {
free(procname);
procname = strdup(bestp->p_comm);
}
}
if (bestp != NULL) {
procname = get_proc_argv0(bestp->p_pid);
if (procname == NULL || *procname == '\0') {
free(procname);
procname = strdup(bestp->p_comm);
}
} else
procname = NULL;
free(buf);
return (procname);