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
|
$NetBSD: patch-cd,v 1.1 2007/11/05 19:06:06 drochner Exp $
--- sysdeps/bsd/procargs.c.orig 2007-04-27 00:27:34.000000000 +0200
+++ sysdeps/bsd/procargs.c
@@ -47,12 +47,16 @@ char *
glibtop_get_proc_args_p (glibtop *server, glibtop_proc_args *buf,
pid_t pid, unsigned max_len)
{
+#if defined(__NetBSD__)
+ struct kinfo_proc2 *pinfo;
+#else
struct kinfo_proc *pinfo;
+#endif
char *retval, **args, **ptr;
size_t size = 0, pos = 0;
int count;
-#ifndef __bsdi__
+#if !defined(__bsdi__) && !defined(__NetBSD)
char filename [BUFSIZ];
struct stat statb;
#endif
@@ -64,7 +68,7 @@ glibtop_get_proc_args_p (glibtop *server
/* swapper, init, pagedaemon, vmdaemon, update - this doen't work. */
if (pid < 5) return NULL;
-#ifndef __bsdi__
+#if !defined(__bsdi__) && !defined(__NetBSD__)
sprintf (filename, "/proc/%d/mem", pid);
if (stat (filename, &statb)) return NULL;
#endif
@@ -72,14 +76,23 @@ glibtop_get_proc_args_p (glibtop *server
glibtop_suid_enter (server);
/* Get the process data */
+#if defined(__NetBSD__)
+ pinfo = kvm_getproc2 (server->machine.kd, KERN_PROC_PID, pid,
+ sizeof (*pinfo), &count);
+#else
pinfo = kvm_getprocs (server->machine.kd, KERN_PROC_PID, pid, &count);
+#endif
if ((pinfo == NULL) || (count < 1)) {
glibtop_suid_leave (server);
glibtop_warn_io_r (server, "kvm_getprocs (%d)", pid);
return NULL;
}
+#if defined(__NetBSD__)
+ args = kvm_getargv2 (server->machine.kd, pinfo, max_len);
+#else
args = kvm_getargv (server->machine.kd, pinfo, max_len);
+#endif
if (args == NULL) {
glibtop_suid_leave (server);
glibtop_warn_io_r (server, "kvm_getargv (%d)", pid);
|
