fastfetch-cli/fastfetch
1
0
Fork 0
mirror of https://github.com/fastfetch-cli/fastfetch.git synced 2026-09-13 02:42:09 +02:00
Code Issues Packages Projects Releases 10 Wiki Activity

Processing: always trim white spaces

Browse Source
This commit is contained in:
李通洲
2023-07-20 16:10:13 +08:00
parent e9ec7d3597
commit d13e72b815
2 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/common/processing.h
+12 -4
View File
@@ -9,15 +9,23 @@ const char* ffProcessAppendOutput(FFstrbuf* buffer, char* const argv[], bool use
static inline const char* ffProcessAppendStdOut(FFstrbuf* buffer, char* const argv[])
{
const char* error = ffProcessAppendOutput(buffer, argv, false);
if (!error) ffStrbufTrimRight(buffer, '\n');
const char* error = ffProcessAppendOutput(buffer, argv, false);
if (!error)
{
ffStrbufTrimRight(buffer, '\n');
ffStrbufTrimRight(buffer, ' ');
}
return error;
}
static inline const char* ffProcessAppendStdErr(FFstrbuf* buffer, char* const argv[])
{
const char* error = ffProcessAppendOutput(buffer, argv, true);
if (!error) ffStrbufTrimRight(buffer, '\n');
const char* error = ffProcessAppendOutput(buffer, argv, true);
if (!error)
{
ffStrbufTrimRight(buffer, '\n');
ffStrbufTrimRight(buffer, ' ');
}
return error;
}
src/detection/terminalshell/terminalshell.c
+1 -7
View File
@@ -41,17 +41,11 @@ static bool getFileVersion(const char* exePath, FFstrbuf* version)
static bool getExeVersionRaw(FFstrbuf* exe, FFstrbuf* version)
{
bool ok = ffProcessAppendStdOut(version, (char* const[]) {
return ffProcessAppendStdOut(version, (char* const[]) {
exe->chars,
"--version",
NULL
}) == NULL;
if (ok)
{
ffStrbufTrim(version, '\n');
ffStrbufTrim(version, ' ');
}
return ok;
}
static bool getExeVersionGeneral(FFstrbuf* exe, FFstrbuf* version)