circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-01-05 23:38:48 +00:00
Code Issues Projects Releases Wiki Activity

PatchSet 887

Browse Source 
Date: 2011/04/10 04:20:59
Author: guenther
Branch: HEAD
Tag: (none)
Log:
Switch back from KERN_PROC2/kinfo_proc2 to KERN_PROC/kinfo_proc now
that we've got name we want for the API we want
This commit is contained in:
Nicholas Marriott 2011-04-18 21:03:42 +00:00
parent dd34cc012a
commit a6456f4db3
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
options-table.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: options-table.c,v 1.4 2011/04/09 20:00:29 nicm Exp $ */ /* $Id: options-table.c,v 1.6 2011-04-18 21:03:42 nicm Exp $ */
/* /*
* Copyright (c) 2011 Nicholas Marriott <nicm@users.sourceforge.net> * Copyright (c) 2011 Nicholas Marriott <nicm@users.sourceforge.net>

18
osdep-openbsd.c
View File

@ -1,4 +1,4 @@
/* $Id: osdep-openbsd.c,v 1.22 2010-12-30 20:42:39 nicm Exp $ */ /* $Id: osdep-openbsd.c,v 1.23 2011-04-18 21:03:42 nicm Exp $ */
/* /*
* Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net> * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
@ -35,12 +35,12 @@
#define is_stopped(p) \ #define is_stopped(p) \
((p)->p_stat == SSTOP || (p)->p_stat == SZOMB || (p)->p_stat == SDEAD) ((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 *osdep_get_name(int, char *); char *osdep_get_name(int, char *);
struct event_base *osdep_event_init(void); struct event_base *osdep_event_init(void);
struct kinfo_proc2 * struct kinfo_proc *
cmp_procs(struct kinfo_proc2 *p1, struct kinfo_proc2 *p2) cmp_procs(struct kinfo_proc *p1, struct kinfo_proc *p2)
{ {
if (is_runnable(p1) && !is_runnable(p2)) if (is_runnable(p1) && !is_runnable(p2))
return (p1); return (p1);
@ -80,11 +80,11 @@ cmp_procs(struct kinfo_proc2 *p1, struct kinfo_proc2 *p2)
char * char *
osdep_get_name(int fd, char *tty) osdep_get_name(int fd, char *tty)
{ {
int mib[6] = { CTL_KERN, KERN_PROC2, KERN_PROC_PGRP, 0, int mib[6] = { CTL_KERN, KERN_PROC, KERN_PROC_PGRP, 0,
sizeof(struct kinfo_proc2), 0 }; sizeof(struct kinfo_proc), 0 };
struct stat sb; struct stat sb;
size_t len; size_t len;
struct kinfo_proc2 *buf, *newbuf, *bestp; struct kinfo_proc *buf, *newbuf, *bestp;
u_int i; u_int i;
char *name; char *name;
@ -104,7 +104,7 @@ retry:
goto error; goto error;
buf = newbuf; 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 (sysctl(mib, nitems(mib), buf, &len, NULL, 0) == -1) {
if (errno == ENOMEM) if (errno == ENOMEM)
goto retry; goto retry;
@ -112,7 +112,7 @@ retry:
} }
bestp = NULL; 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) if ((dev_t)buf[i].p_tdev != sb.st_rdev)
continue; continue;
if (bestp == NULL) if (bestp == NULL)