paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2026-02-04 09:44:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

lazutils: fixed SplitCmdLine escape chars

Browse Source 
git-svn-id: trunk@60544 -
This commit is contained in:
mattias 2019-02-28 20:52:48 +00:00
parent 33c555282c
commit d4a8763c35
1 changed files with 21 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
components/lazutils/lazfileutils.pas
View File

@ -1384,7 +1384,21 @@ end;
procedure SplitCmdLine(const CmdLine: string;
out ProgramFilename, Params: string);
var p, s, l: integer;
var
p: integer;
procedure SkipChar; inline;
begin
{$IFDEF Unix}
if (CmdLine[p]='\') and (p<length(CmdLine)) then
// skip escaped char
inc(p,2)
else
{$ENDIF}
inc(p);
end;
var s, l: integer;
quote: char;
begin
ProgramFilename:='';
@ -1397,28 +1411,20 @@ begin
// skip quoted string
quote:=CmdLine[p];
inc(s);
repeat
inc(p);
if p>Length(CmdLine) then Break;
// check if we have an escape char
if (CmdLine[p] = '\') and (CmdLine[p]<>PathDelim) then inc(p);
until (p>Length(CmdLine)) or (CmdLine[p]=quote);
inc(p);
while (p<=length(CmdLine)) and (CmdLine[p]<>quote) do
SkipChar;
// go past last character or quoted string
l:=p-s;
inc(p);
end else begin
while (p<=length(CmdLine)) and (CmdLine[p]>' ') do begin
if (CmdLine[p] in ['/','\']) and (CmdLine[p]<>PathDelim) then begin
// skip special char
inc(p);
end;
inc(p);
end;
while (p<=length(CmdLine)) and (CmdLine[p]>' ') do
SkipChar;
l:=p-s;
end;
ProgramFilename:=Copy(CmdLine,s,l);
while (p<=length(CmdLine)) and (CmdLine[p]<=' ') do inc(p);
Params:=RightStr(CmdLine,length(CmdLine)-p+1);
Params:=copy(CmdLine,p,length(CmdLine));
end;
function PrepareCmdLineOption(const Option: string): string;