From c0d02024407411f75a4d7d5b63f26b74c727027b Mon Sep 17 00:00:00 2001
From: Benny Baumann <BenBE@geshi.org>
Date: Sat, 24 Apr 2021 12:06:49 +0200
Subject: Move LinuxProcess_getCommandStr to Process_getCommandStr

---
 Process.c | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

(limited to 'Process.c')

diff --git a/Process.c b/Process.c
index f6f4d48f..5334d885 100644
--- a/Process.c
+++ b/Process.c
@@ -521,8 +521,15 @@ void Process_done(Process* this) {
    free(this->tty_name);
 }
 
-static const char* Process_getCommandStr(const Process* p) {
-   return p->cmdline ? p->cmdline : "";
+/* This function returns the string displayed in Command column, so that sorting
+ * happens on what is displayed - whether comm, full path, basename, etc.. So
+ * this follows Process_writeField(COMM) and Process_writeCommand */
+const char *Process_getCommandStr(const Process *this) {
+   if ((Process_isUserlandThread(this) && this->settings->showThreadNames) || !this->mergedCommand.str) {
+      return this->cmdline;
+   }
+
+   return this->mergedCommand.str;
 }
 
 const ProcessClass Process_class = {
-- 
cgit v1.2.3