1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
|
--- sysdeps/freebsd/procwd.c.orig 2008-08-18 11:23:36.000000000 -0400
+++ sysdeps/freebsd/procwd.c 2008-12-07 00:19:44.000000000 -0500
@@ -27,6 +27,9 @@
#include <sys/sysctl.h>
#include <sys/param.h>
#include <sys/user.h>
+#ifdef HAVE_KINFO_GETFILE
+#include <libutil.h>
+#endif
#include <string.h>
static const unsigned long _glibtop_sysdeps_proc_wd =
@@ -101,10 +104,14 @@ glibtop_get_proc_wd_s(glibtop *server, g
#if __FreeBSD_version > 800018 || (__FreeBSD_version < 800000 && __FreeBSD_version >= 700104)
struct kinfo_file *freep, *kif;
GPtrArray *dirs;
+#ifndef HAVE_KINFO_GETFILE
size_t len;
- int i;
int name[4];
#else
+ int cnt;
+#endif
+ int i;
+#else
char *output;
#endif
@@ -115,6 +122,7 @@ glibtop_get_proc_wd_s(glibtop *server, g
buf->flags |= (1 << GLIBTOP_PROC_WD_EXE);
#if __FreeBSD_version > 800018 || (__FreeBSD_version < 800000 && __FreeBSD_version >= 700104)
+#ifndef HAVE_KINFO_GETFILE
name[0] = CTL_KERN;
name[1] = KERN_PROC;
name[2] = KERN_PROC_FILEDESC;
@@ -127,10 +135,21 @@ glibtop_get_proc_wd_s(glibtop *server, g
g_free(freep);
return NULL;
}
+#else
+ freep = kinfo_getfile(pid, &cnt);
+#endif
dirs = g_ptr_array_sized_new(1);
+#ifndef HAVE_KINFO_GETFILE
for (i = 0; i < len / sizeof(*kif); i++, kif++) {
+ if (kif->kf_structsize != sizeof(*kif))
+ continue;
+#else
+ for (i = 0; i < cnt; i++) {
+ kif = &freep[i];
+#endif
+
switch (kif->kf_fd) {
case KF_FD_TYPE_ROOT:
g_strlcpy(buf->root, kif->kf_path,
|
