zeldon/htop
1
0
Fork 0
mirror of https://github.com/xzeldon/htop.git synced 2025-07-12 12:14:36 +03:00
Code Issues Packages Projects Releases Wiki Activity

Move procExeBasenameOffset to main Process structure

Browse Source 
This drops procExeLen, as that field is implicit by strlen(Process->procExe)
This commit is contained in:
Benny Baumann
2021-02-01 23:23:10 +01:00
committed by BenBE
parent 93a44acf7e
commit a685661866
4 changed files with 20 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
linux/LinuxProcessList.c
View File

@ -1167,29 +1167,34 @@ static bool LinuxProcessList_readCmdlineFile(Process* process, openat_arg_t proc
if (amtRead > 0) {
filename[amtRead] = 0;
lp->mergedCommand.maxLen += amtRead; /* accommodate exe */
if (!process->procExe || !String_eq(filename, process->procExe)) {
if (!process->procExe ||
(!process->procExeDeleted && !String_eq(filename, process->procExe)) ||
(process->procExeDeleted && !String_startsWith(filename, process->procExe))) {
free_and_xStrdup(&process->procExe, filename);
lp->procExeLen = amtRead;
/* exe is guaranteed to contain at least one /, but validate anyway */
while (amtRead && filename[--amtRead] != '/')
;
lp->procExeBasenameOffset = amtRead + 1;
process->procExeBasenameOffset = amtRead + 1;
lp->mergedCommand.exeChanged = true;
const char* deletedMarker = " (deleted)";
if (strlen(process->procExe) > strlen(deletedMarker)) {
process->procExeDeleted = String_eq(process->procExe + strlen(process->procExe) - strlen(deletedMarker), deletedMarker);
if (process->procExeDeleted && strlen(process->procExe) - strlen(deletedMarker) == 1 && process->procExe[0] == '/') {
lp->procExeBasenameOffset = 0;
if (process->procExeDeleted) {
process->procExe[strlen(process->procExe) - strlen(deletedMarker)] = '\0';
if (String_eq(process->procExe, "/"))
process->procExeBasenameOffset = 0;
}
}
}
} else if (process->procExe) {
free(process->procExe);
process->procExe = NULL;
lp->procExeLen = 0;
lp->procExeBasenameOffset = 0;
process->procExeBasenameOffset = 0;
process->procExeDeleted = false;
lp->mergedCommand.exeChanged = true;
}