Merge sync of head

3 files changed, 58 insertions, 29 deletions

diff --git a/lib/libprocstat/Makefile b/lib/libprocstat/Makefile
index 32c7daa..fc71dbc 100644
--- a/lib/libprocstat/Makefile
+++ b/lib/libprocstat/Makefile
@@ -19,10 +19,39 @@ INCS=		libprocstat.h
 CFLAGS+=	-I. -I${.CURDIR} -D_KVM_VNODE
 SHLIB_MAJOR=	1
 
-DPADD=		${LIBELF} ${LIBKVM} ${LIBUTIL}
-LDADD=		-lelf -lkvm -lutil
+LIBADD=		elf kvm util
 
 MAN=		libprocstat.3
+MLINKS+=libprocstat.3 procstat_close.3 \
+		libprocstat.3 procstat_freeargv.3 \
+		libprocstat.3 procstat_freeauxv.3 \
+		libprocstat.3 procstat_freeenvv.3 \
+		libprocstat.3 procstat_freefiles.3 \
+		libprocstat.3 procstat_freegroups.3 \
+		libprocstat.3 procstat_freekstack.3 \
+		libprocstat.3 procstat_freeprocs.3 \
+		libprocstat.3 procstat_freevmmap.3 \
+		libprocstat.3 procstat_get_pipe_info.3 \
+		libprocstat.3 procstat_get_pts_info.3 \
+		libprocstat.3 procstat_get_sem_info.3 \
+		libprocstat.3 procstat_get_shm_info.3 \
+		libprocstat.3 procstat_get_socket_info.3 \
+		libprocstat.3 procstat_get_vnode_info.3 \
+		libprocstat.3 procstat_getargv.3 \
+		libprocstat.3 procstat_getauxv.3 \
+		libprocstat.3 procstat_getenvv.3 \
+		libprocstat.3 procstat_getfiles.3 \
+		libprocstat.3 procstat_getgroups.3 \
+		libprocstat.3 procstat_getkstack.3 \
+		libprocstat.3 procstat_getosrel.3 \
+		libprocstat.3 procstat_getpathname.3 \
+		libprocstat.3 procstat_getprocs.3 \
+		libprocstat.3 procstat_getrlimit.3 \
+		libprocstat.3 procstat_getumask.3 \
+		libprocstat.3 procstat_getvmmap.3 \
+		libprocstat.3 procstat_open_core.3 \
+		libprocstat.3 procstat_open_kvm.3 \
+		libprocstat.3 procstat_open_sysctl.3
 
 # XXX This is a hack.
 .if ${MK_CDDL} != "no"
diff --git a/lib/libprocstat/libprocstat.3 b/lib/libprocstat/libprocstat.3
index 1c1f811..e8be41c 100644
--- a/lib/libprocstat/libprocstat.3
+++ b/lib/libprocstat/libprocstat.3
@@ -24,25 +24,11 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd May 3, 2013
+.Dd May 18, 2015
 .Dt LIBPROCSTAT 3
 .Os
 .Sh NAME
-.Nm procstat_open_core ,
-.Nm procstat_open_kvm ,
-.Nm procstat_open_sysctl ,
 .Nm procstat_close ,
-.Nm procstat_getargv ,
-.Nm procstat_getauxv ,
-.Nm procstat_getenvv ,
-.Nm procstat_getfiles ,
-.Nm procstat_getgroups ,
-.Nm procstat_getkstack ,
-.Nm procstat_getosrel ,
-.Nm procstat_getpathname ,
-.Nm procstat_getprocs ,
-.Nm procstat_getumask ,
-.Nm procstat_getvmmap ,
 .Nm procstat_freeargv ,
 .Nm procstat_freeauxv ,
 .Nm procstat_freeenvv ,
@@ -56,7 +42,22 @@
 .Nm procstat_get_sem_info ,
 .Nm procstat_get_shm_info ,
 .Nm procstat_get_socket_info ,
-.Nm procstat_get_vnode_info
+.Nm procstat_get_vnode_info ,
+.Nm procstat_getargv ,
+.Nm procstat_getauxv ,
+.Nm procstat_getenvv ,
+.Nm procstat_getfiles ,
+.Nm procstat_getgroups ,
+.Nm procstat_getkstack ,
+.Nm procstat_getosrel ,
+.Nm procstat_getpathname ,
+.Nm procstat_getprocs ,
+.Nm procstat_getrlimit ,
+.Nm procstat_getumask ,
+.Nm procstat_getvmmap ,
+.Nm procstat_open_core ,
+.Nm procstat_open_kvm ,
+.Nm procstat_open_sysctl
 .Nd library interface for file and process information retrieval
 .Sh LIBRARY
 .Lb libprocstat
@@ -175,17 +176,24 @@
 .Fa "struct kinfo_proc *kp"
 .Fa "unsigned int *count"
 .Fc
+.Ft "struct kinfo_kstack *"
+.Fo procstat_getkstack
+.Fa "struct procstat *procstat"
+.Fa "struct kinfo_proc *kp"
+.Fa "unsigned int *count"
+.Fc
 .Ft int
 .Fo procstat_getosrel
 .Fa "struct procstat *procstat"
 .Fa "struct kinfo_proc *kp"
 .Fa "int *osrelp"
 .Fc
-.Ft "struct kinfo_kstack *"
-.Fo procstat_getkstack
+.Ft "int"
+.Fo procstat_getpathname
 .Fa "struct procstat *procstat"
 .Fa "struct kinfo_proc *kp"
-.Fa "unsigned int *count"
+.Fa "char *pathname"
+.Fa "size_t maxlen"
 .Fc
 .Ft "struct kinfo_proc *"
 .Fo procstat_getprocs
@@ -195,13 +203,6 @@
 .Fa "unsigned int *count"
 .Fc
 .Ft "int"
-.Fo procstat_getpathname
-.Fa "struct procstat *procstat"
-.Fa "struct kinfo_proc *kp"
-.Fa "char *pathname"
-.Fa "size_t maxlen"
-.Fc
-.Ft "int"
 .Fo procstat_getrlimit
 .Fa "struct procstat *procstat"
 .Fa "struct kinfo_proc *kp"
diff --git a/lib/libprocstat/udf.c b/lib/libprocstat/udf.c
index 5d9310e..90c369c 100644
--- a/lib/libprocstat/udf.c
+++ b/lib/libprocstat/udf.c
@@ -30,7 +30,6 @@ __FBSDID("$FreeBSD$");
 #include <sys/stat.h>
 #include <sys/time.h>
 #include <sys/vnode.h>
-#include <sys/buf.h>
 #define _KERNEL
 #include <sys/mount.h>
 #undef _KERNEL