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
|
--- ./base/process/process_handle_freebsd.cc.orig 2014-04-24 22:36:10.000000000 +0200
+++ ./base/process/process_handle_freebsd.cc 2014-04-24 23:23:41.000000000 +0200
@@ -6,33 +6,35 @@
#include <sys/sysctl.h>
#include <sys/types.h>
-#include <unistd.h>
+#include <sys/user.h>
+
+#include "base/logging.h"
namespace base {
ProcessId GetParentProcessId(ProcessHandle process) {
struct kinfo_proc info;
- size_t length;
- int mib[] = { CTL_KERN, KERN_PROC, KERN_PROC_PID, process };
-
- if (sysctl(mib, arraysize(mib), &info, &length, NULL, 0) < 0)
+ size_t length = sizeof(struct kinfo_proc);
+ int mib[4] = { CTL_KERN, KERN_PROC, KERN_PROC_PID, process };
+ if (sysctl(mib, 4, &info, &length, NULL, 0) < 0) {
+ DPLOG(ERROR) << "sysctl";
+ return -1;
+ }
+ if (length == 0)
return -1;
-
return info.ki_ppid;
}
FilePath GetProcessExecutablePath(ProcessHandle process) {
char pathname[PATH_MAX];
- size_t length;
+ size_t length = sizeof(pathname);
int mib[] = { CTL_KERN, KERN_PROC, KERN_PROC_PATHNAME, process };
-
- length = sizeof(pathname);
-
- if (sysctl(mib, arraysize(mib), pathname, &length, NULL, 0) < 0 ||
- length == 0) {
+ if (sysctl(mib, arraysize(mib), pathname, &length, NULL, 0) < 0) {
+ DPLOG(ERROR) << "sysctl";
return FilePath();
}
-
+ if (length == 0)
+ return FilePath();
return FilePath(std::string(pathname));
}
|
