(v3b) cmdlineBasenameLen

Explorer09 · Feb 2, 2025 · 8137405 · 8137405
1 parent 4f112fc
commit 8137405
Showing 1 changed file with 8 additions and 6 deletions.
diff --git a/Process.c b/Process.c
@@ -310,11 +310,13 @@ void Process_makeCommandStr(Process* this, const Settings* settings) {
    char* str = strStart;
 
    int cmdlineBasenameStart = this->cmdlineBasenameStart;
-   int cmdlineBasenameEnd = this->cmdlineBasenameEnd;
+   int cmdlineBasenameLen = 0;
+   if (this->cmdlineBasenameEnd > this->cmdlineBasenameStart)
+      cmdlineBasenameLen = this->cmdlineBasenameEnd - this->cmdlineBasenameStart;
 
    if (!cmdline) {
       cmdlineBasenameStart = 0;
-      cmdlineBasenameEnd = 0;
+      cmdlineBasenameLen = 0;
       cmdline = "(zombie)";
    }
 
@@ -337,13 +339,13 @@ void Process_makeCommandStr(Process* this, const Settings* settings) {
       if (shadowDistPathPrefix && showProgramPath)
          CHECK_AND_MARK_DIST_PATH_PREFIXES(cmdline);
 
-      if (cmdlineBasenameEnd > cmdlineBasenameStart)
-         WRITE_HIGHLIGHT(showProgramPath ? cmdlineBasenameStart : 0, cmdlineBasenameEnd - cmdlineBasenameStart, baseAttr, CMDLINE_HIGHLIGHT_FLAG_BASENAME);
+      if (cmdlineBasenameLen > 0)
+         WRITE_HIGHLIGHT(showProgramPath ? cmdlineBasenameStart : 0, cmdlineBasenameLen, baseAttr, CMDLINE_HIGHLIGHT_FLAG_BASENAME);
 
       if (this->procExeDeleted)
-         WRITE_HIGHLIGHT(showProgramPath ? cmdlineBasenameStart : 0, cmdlineBasenameEnd - cmdlineBasenameStart, delExeAttr, CMDLINE_HIGHLIGHT_FLAG_DELETED);
+         WRITE_HIGHLIGHT(showProgramPath ? cmdlineBasenameStart : 0, cmdlineBasenameLen, delExeAttr, CMDLINE_HIGHLIGHT_FLAG_DELETED);
       else if (this->usesDeletedLib)
-         WRITE_HIGHLIGHT(showProgramPath ? cmdlineBasenameStart : 0, cmdlineBasenameEnd - cmdlineBasenameStart, delLibAttr, CMDLINE_HIGHLIGHT_FLAG_DELETED);
+         WRITE_HIGHLIGHT(showProgramPath ? cmdlineBasenameStart : 0, cmdlineBasenameLen, delLibAttr, CMDLINE_HIGHLIGHT_FLAG_DELETED);
 
       (void)stpcpyWithNewlineConversion(str, cmdline + (showProgramPath ? 0 : cmdlineBasenameStart));