Differential D18757 Diff 55230 www/qt5-webengine/files/patch-src_3rdparty_chromium_base_process_process__iterator__freebsd.cc
Changeset View
Changeset View
Standalone View
Standalone View
www/qt5-webengine/files/patch-src_3rdparty_chromium_base_process_process__iterator__freebsd.cc
--- src/3rdparty/chromium/base/process/process_iterator_freebsd.cc.orig 2017-01-26 00:49:07 UTC | --- src/3rdparty/chromium/base/process/process_iterator_freebsd.cc.orig 2018-11-13 18:25:11 UTC | ||||
+++ src/3rdparty/chromium/base/process/process_iterator_freebsd.cc | +++ src/3rdparty/chromium/base/process/process_iterator_freebsd.cc | ||||
@@ -10,6 +10,10 @@ | @@ -10,6 +10,10 @@ | ||||
#include <sys/sysctl.h> | #include <sys/sysctl.h> | ||||
#include <unistd.h> | #include <unistd.h> | ||||
+/* getuid() */ | +/* getuid() */ | ||||
+#include <unistd.h> | +#include <unistd.h> | ||||
+#include <sys/types.h> | +#include <sys/types.h> | ||||
+ | + | ||||
#include "base/logging.h" | #include "base/logging.h" | ||||
#include "base/macros.h" | #include "base/macros.h" | ||||
#include "base/strings/string_split.h" | #include "base/strings/string_split.h" | ||||
@@ -72,19 +76,13 @@ bool ProcessIterator::CheckForNextProces | @@ -40,7 +44,7 @@ ProcessIterator::ProcessIterator(const ProcessFilter* | ||||
num_of_kinfo_proc += 16; | |||||
kinfo_procs_.resize(num_of_kinfo_proc); | |||||
len = num_of_kinfo_proc * sizeof(struct kinfo_proc); | |||||
- if (sysctl(mib, arraysize(mib), &kinfo_procs_[0], &len, NULL, 0) <0) { | |||||
+ if (sysctl(mib, arraysize(mib), kinfo_procs_.data(), &len, NULL, 0) <0) { | |||||
// If we get a mem error, it just means we need a bigger buffer, so | |||||
// loop around again. Anything else is a real error and give up. | |||||
if (errno != ENOMEM) { | |||||
@@ -72,19 +76,13 @@ bool ProcessIterator::CheckForNextProcess() { | |||||
for (; index_of_kinfo_proc_ < kinfo_procs_.size(); ++index_of_kinfo_proc_) { | for (; index_of_kinfo_proc_ < kinfo_procs_.size(); ++index_of_kinfo_proc_) { | ||||
size_t length; | size_t length; | ||||
struct kinfo_proc kinfo = kinfo_procs_[index_of_kinfo_proc_]; | struct kinfo_proc kinfo = kinfo_procs_[index_of_kinfo_proc_]; | ||||
- int mib[] = { CTL_KERN, KERN_PROC_ARGS, kinfo.ki_pid }; | - int mib[] = { CTL_KERN, KERN_PROC_ARGS, kinfo.ki_pid }; | ||||
+ int mib[] = { CTL_KERN, KERN_PROC, KERN_PROC_ARGS, kinfo.ki_pid }; | + int mib[] = { CTL_KERN, KERN_PROC, KERN_PROC_ARGS, kinfo.ki_pid }; | ||||
if ((kinfo.ki_pid > 0) && (kinfo.ki_stat == SZOMB)) | if ((kinfo.ki_pid > 0) && (kinfo.ki_stat == SZOMB)) | ||||
continue; | continue; | ||||
Show All 14 Lines |