mirror of
https://github.com/doublecmd/doublecmd.git
synced 2026-06-28 10:02:14 +00:00
UPD: Changed quoting of arguments passed to Unix shell so that they can be properly quoted inside other quotes. Implemented proper splitting command line to args on Unix (quoting is used differently that on Windows).
This commit is contained in:
cobines
parent
c9d194d79a
commit
48c4c28ec4
2 changed files with 150 additions and 105 deletions
|
|
@ -482,9 +482,8 @@ end;
|
|||
function ExecCmdFork(sCmdLine:String; bTerm : Boolean; sTerm : String) : Boolean;
|
||||
{$IFDEF UNIX}
|
||||
var
|
||||
sTempStr : String;
|
||||
sTempStr, Command : String;
|
||||
x, pid : LongInt;
|
||||
Command : String;
|
||||
Args : TOpenStringArray;
|
||||
WaitForPidThread: TWaitForPidThread;
|
||||
begin
|
||||
|
|
@ -492,26 +491,14 @@ begin
|
|||
|
||||
if bTerm then
|
||||
begin
|
||||
x := 1;
|
||||
while x <= Length(sTempStr) do begin
|
||||
if (sTempStr[x] in [{'"',} '''']) and ((x = 1) or (sTempStr[x - 1] <> ShieldChar)) then
|
||||
Insert(ShieldChar, sTempStr, x);
|
||||
Inc(x);
|
||||
end;
|
||||
// Escape single quotes because such are used in fmtRunInTerm.
|
||||
sTempStr := EscapeSingleQuotes(sTempStr);
|
||||
if sTerm = '' then sTerm := RunInTerm;
|
||||
sTempStr := Format(fmtRunInTerm, [sTerm, sTempStr]);
|
||||
end;
|
||||
|
||||
SplitArgs(Args, sTempStr);
|
||||
|
||||
if Length(Args) = 0 then Exit;
|
||||
|
||||
Command := Args[0];
|
||||
|
||||
// remove command from args (0th element)
|
||||
for x := 1 to Length(Args) - 1 do
|
||||
Args[x-1] := RemoveQuotation(Args[x]);
|
||||
SetLength(Args, Length(Args) - 1);
|
||||
SplitCmdLine(sTempStr, Command, Args);
|
||||
if Command = EmptyStr then Exit(False);
|
||||
|
||||
pid := fpFork;
|
||||
|
||||
|
|
@ -524,7 +511,7 @@ begin
|
|||
end
|
||||
else if pid = -1 then { Fork failed }
|
||||
begin
|
||||
raise Exception.Create('Fork failed: ' + sCmdLine);
|
||||
raise Exception.Create('Fork failed: ' + Command);
|
||||
end
|
||||
else if pid > 0 then { Parent }
|
||||
begin
|
||||
|
|
@ -2158,4 +2145,4 @@ finalization
|
|||
|
||||
{$ENDIF}
|
||||
|
||||
end.
|
||||
end.
|
||||
234
src/udcutils.pas
234
src/udcutils.pas
|
|
@ -112,14 +112,6 @@ function GetPathType(const sPath : String): TPathType;
|
|||
@returns(File name without path and extension)
|
||||
}
|
||||
function ExtractOnlyFileName(const FileName: string): string;
|
||||
{en
|
||||
Split command line on command and parameters
|
||||
@param(sCmdLine Command line)
|
||||
@param(sCmd Command)
|
||||
@param(sParams Parameters)
|
||||
@returns(The function returns @true if successful, @false otherwise)
|
||||
}
|
||||
function SplitCmdLine(sCmdLine : String; var sCmd, sParams : String) : Boolean;
|
||||
{en
|
||||
Convert file size to string representation in floating format (Kb, Mb, Gb)
|
||||
@param(iSize File size)
|
||||
|
|
@ -286,12 +278,24 @@ function EscapeNoQuotes(const Str: String): String;
|
|||
@returns(String without quotation characters)
|
||||
}
|
||||
function RemoveQuotation(const Str: String): String;
|
||||
{$IF DEFINED(UNIX)}
|
||||
{en
|
||||
Split command line on list of arguments
|
||||
Split command line to command and a list of arguments.
|
||||
Each argument is unquoted.
|
||||
@param(sCmdLine Command line)
|
||||
@param(sCommand Command)
|
||||
@param(Args List of arguments)
|
||||
@param(CmdLine Command line)
|
||||
}
|
||||
procedure SplitArgs(var Args: TOpenStringArray; CmdLine: String);
|
||||
procedure SplitCmdLine(sCmdLine: String; out sCommand: String; out Args: TOpenStringArray);
|
||||
{$ELSEIF DEFINED(MSWINDOWS)}
|
||||
{en
|
||||
Split command line to command and parameters
|
||||
@param(sCmdLine Command line)
|
||||
@param(sCmd Command)
|
||||
@param(sParams Parameters)
|
||||
}
|
||||
procedure SplitCmdLine(sCmdLine : String; var sCmd, sParams : String);
|
||||
{$ENDIF}
|
||||
{en
|
||||
Remove last line ending in text
|
||||
@param(sText Text)
|
||||
|
|
@ -532,34 +536,6 @@ begin
|
|||
Result := Copy(FileName, I + 1, iDotIndex - I - 1);
|
||||
end;
|
||||
|
||||
function SplitCmdLine(sCmdLine : String; var sCmd, sParams : String) : Boolean;
|
||||
var
|
||||
iPos : Integer;
|
||||
begin
|
||||
if Pos('"', sCmdLine) = 1 then
|
||||
begin
|
||||
iPos := CharPos('"', sCmdLine, 2);
|
||||
sCmd := Copy(sCmdLine, 2, iPos - 2);
|
||||
sParams := Copy(sCmdLine, iPos + 2, Length(sCmdLine) - iPos + 1)
|
||||
end
|
||||
else
|
||||
begin
|
||||
iPos := Pos(#32, sCmdLine);
|
||||
if iPos <> 0 then
|
||||
begin
|
||||
sCmd := Copy(sCmdLine, 1, iPos - 1);
|
||||
sParams := Copy(sCmdLine, iPos + 1, Length(sCmdLine) - iPos + 1)
|
||||
end
|
||||
else
|
||||
begin
|
||||
sCmd := sCmdLine;
|
||||
sParams := '';
|
||||
end;
|
||||
end;
|
||||
sParams:= RemoveQuotation(sParams);
|
||||
Result := (sCmd <>'');
|
||||
end;
|
||||
|
||||
function cnvFormatFileSize(iSize: Int64; ShortFormat: Boolean): String;
|
||||
var
|
||||
d: Double;
|
||||
|
|
@ -979,69 +955,151 @@ begin
|
|||
// need to be escaped with backslash (single character quote).
|
||||
Result := EscapeString(Str, NoQuotesSpecialChars, ShieldChar);
|
||||
end;
|
||||
|
||||
// Helper for RemoveQuotation and SplitCmdLine.
|
||||
procedure RemoveQuotationOrSplitCmdLine(sCmdLine: String; out sCommand: String; out Args: TOpenStringArray; bSplitArgs: Boolean);
|
||||
var
|
||||
I : Integer;
|
||||
QuoteChar : Char;
|
||||
CurrentArg: String = '';
|
||||
DoubleQuotesEscape: Boolean = False;
|
||||
|
||||
procedure AddArgument;
|
||||
begin
|
||||
if bSplitArgs then
|
||||
begin
|
||||
if sCommand = '' then
|
||||
sCommand := CurrentArg;
|
||||
else
|
||||
begin
|
||||
SetLength(Args, Length(Args) + 1);
|
||||
Args[Length(Args) - 1] := CurrentArg;
|
||||
end;
|
||||
CurrentArg := '';
|
||||
end;
|
||||
end;
|
||||
|
||||
begin
|
||||
sCommand := '';
|
||||
SetLength(Args, 0);
|
||||
QuoteChar := #0;
|
||||
for I := 1 to Length(sCmdLine) do
|
||||
case QuoteChar of
|
||||
'\':
|
||||
begin
|
||||
if sCmdLine[I] <> #10 then
|
||||
begin
|
||||
if not (sCmdLine[I] in NoQuotesSpecialChars) then
|
||||
CurrentArg := CurrentArg + '\';
|
||||
CurrentArg := CurrentArg + sCmdLine[I];
|
||||
end;
|
||||
QuoteChar := #0;
|
||||
end;
|
||||
'''':
|
||||
begin
|
||||
if sCmdLine[I] = '''' then
|
||||
QuoteChar := #0
|
||||
else
|
||||
CurrentArg := CurrentArg + sCmdLine[I];
|
||||
end;
|
||||
'"':
|
||||
begin
|
||||
if DoubleQuotesEscape then
|
||||
begin
|
||||
if not (sCmdLine[I] in DoubleQuotesSpecialChars) then
|
||||
CurrentArg := CurrentArg + '\';
|
||||
CurrentArg := CurrentArg + sCmdLine[I];
|
||||
DoubleQuotesEscape := False;
|
||||
end
|
||||
else
|
||||
begin
|
||||
case sCmdLine[I] of
|
||||
'\':
|
||||
DoubleQuotesEscape := True;
|
||||
'"':
|
||||
QuoteChar := #0;
|
||||
else
|
||||
CurrentArg := CurrentArg + sCmdLine[I];
|
||||
end;
|
||||
end;
|
||||
end;
|
||||
else
|
||||
begin
|
||||
case sCmdLine[I] of
|
||||
'\', '''', '"':
|
||||
QuoteChar := sCmdLine[I];
|
||||
' ', #9:
|
||||
if CurrentArg <> '' then
|
||||
AddArgument;
|
||||
#10:
|
||||
AddArgument;
|
||||
else
|
||||
CurrentArg := CurrentArg + sCmdLine[I];
|
||||
end;
|
||||
end;
|
||||
end;
|
||||
if QuoteChar <> #0 then
|
||||
raise Exception.Create('Invalid quoting');
|
||||
if CurrentArg <> '' then
|
||||
AddArgument;
|
||||
if (not bSplitArgs) then
|
||||
sCommand := CurrentArg;
|
||||
end;
|
||||
{$ENDIF}
|
||||
|
||||
function RemoveQuotation(const Str: String): String;
|
||||
{$IF DEFINED(MSWINDOWS)}
|
||||
var
|
||||
I : integer;
|
||||
begin
|
||||
Result := Str;
|
||||
if Length(Result) < 2 then Exit;
|
||||
for I := Length(Result) downto 2 do
|
||||
{$IF DEFINED(MSWINDOWS)}
|
||||
if (Result[I] in QuotationCharacters) and (Result[I - 1] = ShieldChar) then Delete(Result, I - 1, 1);
|
||||
end;
|
||||
{$ELSEIF DEFINED(UNIX)}
|
||||
if (Result[I] in NoQuotesSpecialChars) and (Result[I - 1] = ShieldChar) then Delete(Result, I - 1, 1);
|
||||
{$ENDIF}
|
||||
end;
|
||||
|
||||
procedure SplitArgs(var Args: TOpenStringArray; CmdLine: String);
|
||||
var
|
||||
InQuotes : Boolean;
|
||||
I, Start : Integer;
|
||||
QuoteChar : Char;
|
||||
s : string;
|
||||
Args: TOpenStringArray;
|
||||
begin
|
||||
SetLength(Args, 0);
|
||||
InQuotes := False;
|
||||
CMDLine := Trim(CmdLine);
|
||||
if Length(CmdLine) = 0 then Exit;
|
||||
Start := 1;
|
||||
QuoteChar := #0;
|
||||
for I := 1 to Length(CmdLine) do
|
||||
case CmdLine[I] of
|
||||
' ': if (not InQuotes) and ((I = 1) or (CMDLine[I - 1] <> ShieldChar)) then begin
|
||||
s := Trim(Copy(CmdLine, Start, I - Start));
|
||||
TrimQuotes(s);
|
||||
Start := I;
|
||||
if s = '' then Continue;
|
||||
SetLength(Args, Length(Args) + 1);
|
||||
Args[Length(Args) - 1] := s;
|
||||
end;
|
||||
'"', '''': if (I = 1) or (CmdLine[I - 1] <> ShieldChar) then
|
||||
if not InQuotes then begin
|
||||
InQuotes := True;
|
||||
QuoteChar := CmdLine[I];
|
||||
// Start := i;
|
||||
end else
|
||||
if CMDLine[I] = QuoteChar then begin
|
||||
InQuotes := False;
|
||||
s := Trim(Copy(CmdLine, Start, I + 1 - Start));
|
||||
TrimQuotes(s);
|
||||
Start := I;
|
||||
if s = '' then Continue;
|
||||
// if (Pos('"', s) > 1) and (Pos('"', s) < Length(s)) and (NumCountChars('"', s) mod 2 = 1) then s := s + '"';
|
||||
// if (Pos('''', s) > 1) and (Pos('''', s) < Length(s)) and (NumCountChars('''', s) mod 2 = 1) then s := s + '''';
|
||||
SetLength(Args, Length(Args) + 1);
|
||||
Args[Length(Args) - 1] := s;
|
||||
end;
|
||||
end;
|
||||
if (Start <> Length(CmdLine)) or (Start = 1) then begin
|
||||
SetLength(Args, Length(Args) + 1);
|
||||
Args[Length(Args) - 1] := Trim(Copy(CMDLine, Start, Length(CmdLine) + 1 - Start));
|
||||
TrimQuotes(Args[Length(Args) - 1]);
|
||||
end;
|
||||
RemoveQuotationOrSplitCmdLine(Str, Result, Args, False);
|
||||
end;
|
||||
{$ENDIF}
|
||||
|
||||
{$IF DEFINED(UNIX)}
|
||||
procedure SplitCmdLine(sCmdLine: String; out sCommand: String; out Args: TOpenStringArray);
|
||||
begin
|
||||
sCmdLine := Trim(sCmdLine);
|
||||
RemoveQuotationOrSplitCmdLine(sCmdLine, sCommand, Args, True);
|
||||
end;
|
||||
{$ELSEIF DEFINED(MSWINDOWS)}
|
||||
procedure SplitCmdLine(sCmdLine : String; var sCmd, sParams : String);
|
||||
var
|
||||
iPos : Integer;
|
||||
begin
|
||||
if Pos('"', sCmdLine) = 1 then
|
||||
begin
|
||||
iPos := CharPos('"', sCmdLine, 2);
|
||||
sCmd := Copy(sCmdLine, 2, iPos - 2);
|
||||
sParams := Copy(sCmdLine, iPos + 2, Length(sCmdLine) - iPos + 1)
|
||||
end
|
||||
else
|
||||
begin
|
||||
iPos := Pos(#32, sCmdLine);
|
||||
if iPos <> 0 then
|
||||
begin
|
||||
sCmd := Copy(sCmdLine, 1, iPos - 1);
|
||||
sParams := Copy(sCmdLine, iPos + 1, Length(sCmdLine) - iPos + 1)
|
||||
end
|
||||
else
|
||||
begin
|
||||
sCmd := sCmdLine;
|
||||
sParams := '';
|
||||
end;
|
||||
end;
|
||||
sParams:= RemoveQuotation(sParams);
|
||||
Result := (sCmd <>'');
|
||||
end;
|
||||
{$ENDIF}
|
||||
|
||||
function TrimRightLineEnding(const sText: UTF8String;
|
||||
TextLineBreakStyle: TTextLineBreakStyle): UTF8String;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue