diff options
| author | Benny Baumann <BenBE@geshi.org> | 2020-12-19 16:21:08 +0100 |
|---|---|---|
| committer | BenBE <BenBE@geshi.org> | 2021-05-23 09:22:21 +0200 |
| commit | 02431c43e1db2ab18769dc1f0bcfa52e8219f81a (patch) | |
| tree | 8bdbb2eb343489c3a5ab031e0f510bb3f437c3eb /linux | |
| parent | fbec3e4005ee88052aae273ce98943f8a3db6382 (diff) | |
Rename command line field from comm to cmdline
Diffstat (limited to 'linux')
| -rw-r--r-- | linux/LinuxProcess.c | 4 | ||||
| -rw-r--r-- | linux/LinuxProcessList.c | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/linux/LinuxProcess.c b/linux/LinuxProcess.c index bd9dc89d..230a7271 100644 --- a/linux/LinuxProcess.c +++ b/linux/LinuxProcess.c @@ -110,7 +110,7 @@ const ProcessFieldData Process_fields[LAST_PROCESSFIELD] = { static const char* LinuxProcess_getCommandStr(const Process *this) { const LinuxProcess *lp = (const LinuxProcess *)this; if ((Process_isUserlandThread(this) && this->settings->showThreadNames) || !lp->mergedCommand.str) { - return this->comm; + return this->cmdline; } return lp->mergedCommand.str; } @@ -386,7 +386,7 @@ void LinuxProcess_makeCommandStr(Process* this) { const int delAttr = CRT_colors[FAILED_READ]; /* Establish some shortcuts to data we need */ - const char *cmdline = this->comm; + const char *cmdline = this->cmdline; const char *procExe = lp->procExe; const char *procComm = lp->procComm; diff --git a/linux/LinuxProcessList.c b/linux/LinuxProcessList.c index 51999d1a..24cb6ee1 100644 --- a/linux/LinuxProcessList.c +++ b/linux/LinuxProcessList.c @@ -1132,9 +1132,9 @@ static bool LinuxProcessList_readCmdlineFile(Process* process, openat_arg_t proc LinuxProcess *lp = (LinuxProcess *)process; lp->mergedCommand.maxLen = lastChar + 1; /* accommodate cmdline */ - if (!process->comm || !String_eq(command, process->comm)) { + if (!process->cmdline || !String_eq(command, process->cmdline)) { process->basenameOffset = tokenEnd; - free_and_xStrdup(&process->comm, command); + free_and_xStrdup(&process->cmdline, command); lp->procCmdlineBasenameOffset = tokenStart; lp->procCmdlineBasenameEnd = tokenEnd; lp->mergedCommand.cmdlineChanged = true; @@ -1458,14 +1458,14 @@ static bool LinuxProcessList_recurseProcTree(LinuxProcessList* this, openat_arg_ if (proc->state == 'Z' && (proc->basenameOffset == 0)) { proc->basenameOffset = -1; - free_and_xStrdup(&proc->comm, command); + free_and_xStrdup(&proc->cmdline, command); lp->procCmdlineBasenameOffset = 0; lp->procCmdlineBasenameEnd = 0; lp->mergedCommand.commChanged = true; } else if (Process_isThread(proc)) { if (settings->showThreadNames || Process_isKernelThread(proc)) { proc->basenameOffset = -1; - free_and_xStrdup(&proc->comm, command); + free_and_xStrdup(&proc->cmdline, command); lp->procCmdlineBasenameOffset = 0; lp->procCmdlineBasenameEnd = 0; lp->mergedCommand.commChanged = true; |