zeldon
/
htop
mirror of https://github.com/xzeldon/htop.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Don't store invisible trailing whitespace

This commit is contained in:
Hisham 2016-06-15 12:41:50 -03:00
parent ea9dc4ab74
commit 1a13b4d0f4
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
linux/LinuxProcessList.c
View File

@ -470,6 +470,7 @@ static bool LinuxProcessList_readCmdlineFile(Process* process, const char* dirna
int amtRead = xread(fd, command, sizeof(command) - 1); int amtRead = xread(fd, command, sizeof(command) - 1);
close(fd); close(fd);
int tokenEnd = 0; int tokenEnd = 0;
int lastChar = 0;
if (amtRead > 0) { if (amtRead > 0) {
for (int i = 0; i < amtRead; i++) for (int i = 0; i < amtRead; i++)
if (command[i] == '\0' || command[i] == '\n') { if (command[i] == '\0' || command[i] == '\n') {
@ -477,14 +478,16 @@ static bool LinuxProcessList_readCmdlineFile(Process* process, const char* dirna
tokenEnd = i; tokenEnd = i;
} }
command[i] = ' '; command[i] = ' ';
} else {
lastChar = i;
} }
} }
if (tokenEnd == 0) { if (tokenEnd == 0) {
tokenEnd = amtRead; tokenEnd = amtRead;
} }
command[amtRead] = '\0'; command[lastChar + 1] = '\0';
process->basenameOffset = tokenEnd; process->basenameOffset = tokenEnd;
setCommand(process, command, amtRead); setCommand(process, command, lastChar + 1);
return true; return true;
} }