From 64ea1af99124913687125849c6a11bafaa102aac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=80=9A=E6=B4=B2?= Date: Sat, 15 Jul 2023 15:46:19 +0800 Subject: [PATCH] Processing: always trim trailing new lines --- src/common/processing.h | 8 ++++++-- src/detection/terminalshell/terminalshell.c | 3 --- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/common/processing.h b/src/common/processing.h index 9f02e799d..8b38337c0 100644 --- a/src/common/processing.h +++ b/src/common/processing.h @@ -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 diff --git a/src/detection/terminalshell/terminalshell.c b/src/detection/terminalshell/terminalshell.c index ddfd85390..ad540e666 100644 --- a/src/detection/terminalshell/terminalshell.c +++ b/src/detection/terminalshell/terminalshell.c @@ -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; }