diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-15 19:58:11 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-15 19:58:11 +0000 |
commit | cf625b5f9a5808cd60bbdec8969deb5a5698c02f (patch) | |
tree | 474e4a9d79e47529696421d933dcf76765271364 /debian/patches/004_fix_ktread_display.patch | |
parent | Adding upstream version 3.3.0. (diff) | |
download | htop-debian/3.3.0-4.tar.xz htop-debian/3.3.0-4.zip |
Adding debian version 3.3.0-4.debian/3.3.0-4debian
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'debian/patches/004_fix_ktread_display.patch')
-rw-r--r-- | debian/patches/004_fix_ktread_display.patch | 37 |
1 files changed, 37 insertions, 0 deletions
diff --git a/debian/patches/004_fix_ktread_display.patch b/debian/patches/004_fix_ktread_display.patch new file mode 100644 index 0000000..8fff974 --- /dev/null +++ b/debian/patches/004_fix_ktread_display.patch @@ -0,0 +1,37 @@ +From 71b099a8df9e8c2bf4361a9a93bebc409f513460 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Christian=20G=C3=B6ttsche?= <cgzones@googlemail.com> +Date: Sat, 27 Jan 2024 23:22:31 +0100 +Subject: [PATCH] Disable basename matching for kernel threads + +Kernel threads are commonly not based on an executable and their cmdline +therefore just a human readable string. +On Linux this string might contain slashes, e.g. kworker/7:5H-ttm, which +cause Process_writeCommand() to print only the trailing parts if the +option *Show Program Path* is disabled. + +Reported-and-Suggested-By: mmrmaximuzz +--- + Process.c | 10 ++++++++-- + 1 file changed, 8 insertions(+), 2 deletions(-) + +diff --git a/Process.c b/Process.c +index 1497503f0..9179c0eaf 100644 +--- a/Process.c ++++ b/Process.c +@@ -1038,8 +1038,14 @@ void Process_updateCmdline(Process* this, const char* cmdline, int basenameStart + + free(this->cmdline); + this->cmdline = cmdline ? xStrdup(cmdline) : NULL; +- this->cmdlineBasenameStart = (basenameStart || !cmdline) ? basenameStart : skipPotentialPath(cmdline, basenameEnd); +- this->cmdlineBasenameEnd = basenameEnd; ++ if (Process_isKernelThread(this)) { ++ /* kernel threads have no basename */ ++ this->cmdlineBasenameStart = 0; ++ this->cmdlineBasenameEnd = 0; ++ } else { ++ this->cmdlineBasenameStart = (basenameStart || !cmdline) ? basenameStart : skipPotentialPath(cmdline, basenameEnd); ++ this->cmdlineBasenameEnd = basenameEnd; ++ } + + this->mergedCommand.lastUpdate = 0; + } |