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

Sync OpenBSD patchset 592:

Browse Source 
Use sysctl() KERN_PROC2 instead of KERN_PROC, as the latter's ABI
is sensitive to changes in struct proc.

fixes for warnings and ok nicm@
This commit is contained in:
Tiago Cunha 2009-12-26 23:48:37 +00:00
parent f81b3ddf94
commit 3cc7f2e191
1 changed files with 12 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
osdep-openbsd.c
View File

@ -1,4 +1,4 @@
/* $Id: osdep-openbsd.c,v 1.19 2009-08-09 17:57:39 tcunha Exp $ */ /* $Id: osdep-openbsd.c,v 1.20 2009-12-26 23:48:37 tcunha Exp $ */
/* /*
* Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net> * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
@ -34,14 +34,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 proc *cmp_procs(struct proc *, struct proc *); struct kinfo_proc2 *cmp_procs(struct kinfo_proc2 *, struct kinfo_proc2 *);
char *osdep_get_name(int, char *); char *osdep_get_name(int, char *);
struct proc * struct kinfo_proc2 *
cmp_procs(struct proc *p1, struct proc *p2) cmp_procs(struct kinfo_proc2 *p1, struct kinfo_proc2 *p2)
{ {
void *ptr1, *ptr2;
if (is_runnable(p1) && !is_runnable(p2)) if (is_runnable(p1) && !is_runnable(p2))
return (p1); return (p1);
if (!is_runnable(p1) && is_runnable(p2)) if (!is_runnable(p1) && is_runnable(p2))
@ -67,13 +65,6 @@ cmp_procs(struct proc *p1, struct proc *p2)
if (!(p1->p_flag & P_SINTR) && (p2->p_flag & P_SINTR)) if (!(p1->p_flag & P_SINTR) && (p2->p_flag & P_SINTR))
return (p2); return (p2);
ptr1 = LIST_FIRST(&p1->p_children);
ptr2 = LIST_FIRST(&p2->p_children);
if (ptr1 == NULL && ptr2 != NULL)
return (p1);
if (ptr1 != NULL && ptr2 == NULL)
return (p2);
if (strcmp(p1->p_comm, p2->p_comm) < 0) if (strcmp(p1->p_comm, p2->p_comm) < 0)
return (p1); return (p1);
if (strcmp(p1->p_comm, p2->p_comm) > 0) if (strcmp(p1->p_comm, p2->p_comm) > 0)
@ -87,11 +78,11 @@ cmp_procs(struct proc *p1, struct proc *p2)
char * char *
osdep_get_name(int fd, char *tty) osdep_get_name(int fd, char *tty)
{ {
int mib[4] = { CTL_KERN, KERN_PROC, KERN_PROC_PGRP, 0 }; int mib[6] = { CTL_KERN, KERN_PROC2, KERN_PROC_PGRP, 0,
sizeof(struct kinfo_proc2), 0 };
struct stat sb; struct stat sb;
size_t len; size_t len;
struct kinfo_proc *buf, *newbuf; struct kinfo_proc2 *buf, *newbuf, *bestp;
struct proc *bestp;
u_int i; u_int i;
char *name; char *name;
@ -111,6 +102,7 @@ retry:
goto error; goto error;
buf = newbuf; buf = newbuf;
mib[5] = (int)(len / sizeof(struct kinfo_proc2));
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;
@ -118,13 +110,13 @@ retry:
} }
bestp = NULL; bestp = NULL;
for (i = 0; i < len / sizeof (struct kinfo_proc); i++) { for (i = 0; i < len / sizeof (struct kinfo_proc2); i++) {
if (buf[i].kp_eproc.e_tdev != sb.st_rdev) if ((dev_t)buf[i].p_tdev != sb.st_rdev)
continue; continue;
if (bestp == NULL) if (bestp == NULL)
bestp = &buf[i].kp_proc; bestp = &buf[i];
else else
bestp = cmp_procs(&buf[i].kp_proc, bestp); bestp = cmp_procs(&buf[i], bestp);
} }
name = NULL; name = NULL;