Update of /cvsroot/tmux/tmux
In directory vz-cvs-2.sog:/tmp/cvs-serv26232
Modified Files:
options-table.c osdep-openbsd.c
Log Message:
PatchSet 887
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
Index: osdep-openbsd.c
===================================================================
RCS file: /cvsroot/tmux/tmux/osdep-openbsd.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- osdep-openbsd.c 30 Dec 2010 20:42:39 -0000 1.22
+++ osdep-openbsd.c 18 Apr 2011 21:03:42 -0000 1.23
@@ -35,12 +35,12 @@
#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 *osdep_get_name(int, char *);
struct event_base *osdep_event_init(void);
-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);
@@ -80,11 +80,11 @@
char *
osdep_get_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;
@@ -104,7 +104,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;
@@ -112,7 +112,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)
Index: options-table.c
===================================================================
RCS file: /cvsroot/tmux/tmux/options-table.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- options-table.c 18 Apr 2011 21:01:44 -0000 1.5
+++ options-table.c 18 Apr 2011 21:03:42 -0000 1.6
@@ -1,4 +1,4 @@
-/* $OpenBSD: options-table.c,v 1.4 2011/04/09 20:00:29 nicm Exp $ */
+/* $Id$ */
/*
* Copyright (c) 2011 Nicholas Marriott <[email protected]>
------------------------------------------------------------------------------
Benefiting from Server Virtualization: Beyond Initial Workload
Consolidation -- Increasing the use of server virtualization is a top
priority.Virtualization can reduce costs, simplify management, and improve
application availability and disaster protection. Learn more about boosting
the value of server virtualization. http://p.sf.net/sfu/vmware-sfdev2dev
_______________________________________________
tmux-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tmux-cvs
