Llewellyn/conky
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/conky.git synced 2025-02-05 05:28:32 +00:00
Code Issues Releases Activity

Do not add trailing whitespace to proc cmdline

Browse Source 
According to proc(5), /proc/<pid>/cmdline is supposed to have a NUL between each
argument, plus an additional NUL at the end. Instead of replacing each NUL with
a space, just replace the ones between arguments and ignore the rest.

Partial fix for #121.
This commit is contained in:
Marc Payne 2015-08-26 00:50:08 -06:00
parent a061bcff3e
commit 2a778374a5
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/linux.cc
View File

@ -2675,10 +2675,18 @@ static void process_parse_stat(struct process *process)
return;
}
/* Some processes have null-separated arguments, let's fix it */
for(int i = 0; i < endl; i++)
if (cmdline[i] == 0)
/* Some processes have null-separated arguments (see proc(5)); let's fix it */
int i = endl;
while (i && cmdline[i-1] == 0) {
/* Skip past any trailing null characters */
--i;
}
while (i--) {
/* Replace null character between arguments with a space */
if (cmdline[i] == 0) {
cmdline[i] = ' ';
}
}
cmdline[endl] = 0;