Processing: always trim trailing new lines

This commit is contained in:
李通洲
2023-07-15 15:46:19 +08:00
parent 1ddecf4cdb
commit 64ea1af991
2 changed files with 6 additions and 5 deletions
+6 -2
View File
@@ -9,12 +9,16 @@ const char* ffProcessAppendOutput(FFstrbuf* buffer, char* const argv[], bool use
static inline const char* ffProcessAppendStdOut(FFstrbuf* buffer, char* const argv[])
{
return ffProcessAppendOutput(buffer, argv, false);
const char* error = ffProcessAppendOutput(buffer, argv, false);
if (!error) ffStrbufTrimRight(buffer, '\n');
return error;
}
static inline const char* ffProcessAppendStdErr(FFstrbuf* buffer, char* const argv[])
{
return ffProcessAppendOutput(buffer, argv, true);
const char* error = ffProcessAppendOutput(buffer, argv, true);
if (!error) ffStrbufTrimRight(buffer, '\n');
return error;
}
#endif
@@ -83,7 +83,6 @@ static bool getShellVersionFish(FFstrbuf* exe, FFstrbuf* version)
return false;
//fish, version 3.6.0
ffStrbufTrimRight(version, '\n');
ffStrbufSubstrAfterLastC(version, ' ');
return true;
}
@@ -101,7 +100,6 @@ static bool getShellVersionPwsh(FFstrbuf* exe, FFstrbuf* version)
if(!getExeVersionRaw(exe, version))
return false;
ffStrbufTrimRight(version, '\n');
ffStrbufSubstrAfterLastC(version, ' ');
return true;
}
@@ -118,7 +116,6 @@ static bool getShellVersionWinPowerShell(FFstrbuf* exe, FFstrbuf* version)
NULL
})) return false;
ffStrbufTrimRight(version, '\n');
ffStrbufSubstrAfterLastC(version, ' ');
return true;
}