From 7d64b562691ef1bad829d9486193ac876ad573d6 Mon Sep 17 00:00:00 2001 From: Martin Date: Sun, 7 Aug 2022 23:20:22 +0200 Subject: [PATCH] LazLogger: fix parsing parameters (handling "=") / Issue #39812 (cherry picked from commit 20a05aea8601cc00aeec301bbf63c76ffbbf70c0) --- components/lazutils/lazlogger.pas | 8 ++++++-- components/lazutils/lazloggerbase.pas | 6 +++++- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/components/lazutils/lazlogger.pas b/components/lazutils/lazlogger.pas index 3b00504573..01bdd9a0bf 100644 --- a/components/lazutils/lazlogger.pas +++ b/components/lazutils/lazlogger.pas @@ -569,7 +569,11 @@ end; procedure TLazLoggerFile.SetParamForLogFileName(AValue: String); begin - if FParamForLogFileName = AValue then Exit; + if (AValue <> '') and (AValue[Length(AValue)] = '=') then + Delete(AValue, Length(AValue), 1); + if FParamForLogFileName = AValue then + Exit; + Finish; FGetLogFileNameDone := False; FParamForLogFileName := AValue; @@ -800,7 +804,7 @@ begin FParamForLogFileName := ''; FEnvironmentForLogFileName := ''; {$else} - FParamForLogFileName := '--debug-log='; + FParamForLogFileName := '--debug-log'; FEnvironmentForLogFileName := '*_debuglog'; {$endif} end; diff --git a/components/lazutils/lazloggerbase.pas b/components/lazutils/lazloggerbase.pas index 1ace951ed7..fba22e3c5a 100644 --- a/components/lazutils/lazloggerbase.pas +++ b/components/lazutils/lazloggerbase.pas @@ -1159,7 +1159,11 @@ end; procedure TLazLoggerWithGroupParam.SetParamForEnabledLogGroups(AValue: String); begin - if FParamForEnabledLogGroups = AValue then Exit; + if (AValue <> '') and (AValue[Length(AValue)] = '=') then + Delete(AValue, Length(AValue), 1); + if FParamForEnabledLogGroups = AValue then + Exit; + FParamForEnabledLogGroups := AValue; ParseParamForEnabledLogGroups; end;