Add rtable id and thread id to struct kinfo_proc (and fix process id)

and add an 'rtableid' keyword to ps.

Add rtable id, thread id, and socket splice info to struct kinfo_file2
and make fstat display socket splice information.

Remove old KVM_PROC2 and kinfo_proc2 interfaces; bump libkvm major

Socket splice info and corrections from bluhm@  "Lovely" deraadt@

1 files changed, 1 insertions, 13 deletions

diff --git a/lib/libkvm/kvm_proc.c b/lib/libkvm/kvm_proc.c
index 57be5c1b731..8bc0745b638 100644
--- a/lib/libkvm/kvm_proc.c
+++ b/lib/libkvm/kvm_proc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: kvm_proc.c,v 1.44 2011/06/06 17:18:26 ariane Exp $	*/
+/*	$OpenBSD: kvm_proc.c,v 1.45 2012/01/07 05:38:12 guenther Exp $	*/
 /*	$NetBSD: kvm_proc.c,v 1.30 1999/03/24 05:50:50 mrg Exp $	*/
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -474,12 +474,6 @@ kvm_getargv(kvm_t *kd, const struct kinfo_proc *kp, int nchr)
 }
 
 char **
-kvm_getargv2(kvm_t *kd, const struct kinfo_proc *kp, int nchr)
-{
-	return (kvm_getargv(kd, kp, nchr));
-}
-
-char **
 kvm_getenvv(kvm_t *kd, const struct kinfo_proc *kp, int nchr)
 {
 	struct miniproc p;
@@ -490,12 +484,6 @@ kvm_getenvv(kvm_t *kd, const struct kinfo_proc *kp, int nchr)
 	return (kvm_doargv(kd, &p, nchr, ps_str_e));
 }
 
-char **
-kvm_getenvv2(kvm_t *kd, const struct kinfo_proc *kp, int nchr)
-{
-	return (kvm_getenvv(kd, kp, nchr));
-}
-
 /*
  * Read from user space.  The user context is given by p.
  */