Index: head/devel/qt5-core/files/patch-src_corelib_io_qlockfile__unix.cpp =================================================================== --- head/devel/qt5-core/files/patch-src_corelib_io_qlockfile__unix.cpp (revision 472261) +++ head/devel/qt5-core/files/patch-src_corelib_io_qlockfile__unix.cpp (revision 472262) @@ -1,148 +1,74 @@ --- src/corelib/io/io.pri.orig 2018-02-08 18:24:48 UTC +++ src/corelib/io/io.pri @@ -178,6 +178,9 @@ win32 { SOURCES += \ io/qstandardpaths_unix.cpp \ io/qstorageinfo_unix.cpp + freebsd { + LIBS += -lkvm -lprocstat + } } linux|if(qnx:qtConfig(inotify)) { --- src/corelib/io/qlockfile_unix.cpp.orig 2018-02-08 18:24:48 UTC +++ src/corelib/io/qlockfile_unix.cpp @@ -75,6 +75,8 @@ # include # if !defined(Q_OS_NETBSD) # include +# include +# include # endif #endif @@ -246,23 +248,44 @@ QString QLockFilePrivate::processNameByPid(qint64 pid) struct kinfo_proc kp; int mib[6] = { CTL_KERN, KERN_PROC, KERN_PROC_PID, (int)pid, sizeof(struct kinfo_proc), 1 }; # else + QString nameFromProcstat; + kvm_t *kvm = kvm_open(nullptr, "/dev/null", nullptr, O_RDONLY, ""); + if (kvm) { + int cnt; + struct kinfo_proc *kp = kvm_getprocs(kvm, KERN_PROC_PID, getpid(), &cnt); + if (kp) { + struct procstat *ps = procstat_open_sysctl(); + char **argv = procstat_getargv(ps, kp, 0); + if (argv != nullptr && argv[0] != nullptr) + nameFromProcstat = QString::fromLocal8Bit(argv[0]); + procstat_close(ps); + } + kvm_close(kvm); + } struct kinfo_proc kp; int mib[4] = { CTL_KERN, KERN_PROC, KERN_PROC_PID, (int)pid }; # endif - size_t len = sizeof(kp); - u_int mib_len = sizeof(mib)/sizeof(u_int); + if (nameFromProcstat.isEmpty()) { + size_t len = sizeof(kp); + u_int mib_len = sizeof(mib)/sizeof(u_int); - if (sysctl(mib, mib_len, &kp, &len, NULL, 0) < 0) - return QString(); - + if (sysctl(mib, mib_len, &kp, &len, NULL, 0) < 0) + return QString(); + } # if defined(Q_OS_OPENBSD) || defined(Q_OS_NETBSD) if (kp.p_pid != pid) return QString(); QString name = QFile::decodeName(kp.p_comm); # else - if (kp.ki_pid != pid) + QString name; + if (!nameFromProcstat.isEmpty()) { + QFileInfo fi(nameFromProcstat); + name = fi.fileName(); + } + else if (kp.ki_pid != pid) return QString(); - QString name = QFile::decodeName(kp.ki_comm); + else + name = QFile::decodeName(kp.ki_comm); # endif return name; ---- src/corelib/io/io.pri.orig 2018-02-08 18:24:48 UTC -+++ src/corelib/io/io.pri -@@ -178,6 +178,9 @@ win32 { - SOURCES += \ - io/qstandardpaths_unix.cpp \ - io/qstorageinfo_unix.cpp -+ freebsd { -+ LIBS += -lkvm -lprocstat -+ } - } - - linux|if(qnx:qtConfig(inotify)) { ---- src/corelib/io/qlockfile_unix.cpp.orig 2018-02-08 18:24:48 UTC -+++ src/corelib/io/qlockfile_unix.cpp -@@ -75,6 +75,8 @@ - # include - # if !defined(Q_OS_NETBSD) - # include -+# include -+# include - # endif - #endif - -@@ -246,23 +248,44 @@ QString QLockFilePrivate::processNameByPid(qint64 pid) - struct kinfo_proc kp; - int mib[6] = { CTL_KERN, KERN_PROC, KERN_PROC_PID, (int)pid, sizeof(struct kinfo_proc), 1 }; - # else -+ QString nameFromProcstat; -+ kvm_t *kvm = kvm_open(nullptr, "/dev/null", nullptr, O_RDONLY, ""); -+ if (kvm) { -+ int cnt; -+ struct kinfo_proc *kp = kvm_getprocs(kvm, KERN_PROC_PID, getpid(), &cnt); -+ if (kp) { -+ struct procstat *ps = procstat_open_sysctl(); -+ char **argv = procstat_getargv(ps, kp, 0); -+ if (argv != nullptr && argv[0] != nullptr) -+ nameFromProcstat = QString::fromLocal8Bit(argv[0]); -+ procstat_close(ps); -+ } -+ kvm_close(kvm); -+ } - struct kinfo_proc kp; - int mib[4] = { CTL_KERN, KERN_PROC, KERN_PROC_PID, (int)pid }; - # endif -- size_t len = sizeof(kp); -- u_int mib_len = sizeof(mib)/sizeof(u_int); -+ if (nameFromProcstat.isEmpty()) { -+ size_t len = sizeof(kp); -+ u_int mib_len = sizeof(mib)/sizeof(u_int); - -- if (sysctl(mib, mib_len, &kp, &len, NULL, 0) < 0) -- return QString(); -- -+ if (sysctl(mib, mib_len, &kp, &len, NULL, 0) < 0) -+ return QString(); -+ } - # if defined(Q_OS_OPENBSD) || defined(Q_OS_NETBSD) - if (kp.p_pid != pid) - return QString(); - QString name = QFile::decodeName(kp.p_comm); - # else -- if (kp.ki_pid != pid) -+ QString name; -+ if (!nameFromProcstat.isEmpty()) { -+ QFileInfo fi(nameFromProcstat); -+ name = fi.fileName(); -+ } -+ else if (kp.ki_pid != pid) - return QString(); -- QString name = QFile::decodeName(kp.ki_comm); -+ else -+ name = QFile::decodeName(kp.ki_comm); - # endif - return name;