mirrors/doublecmd
2
0
Fork 0
mirror of https://github.com/doublecmd/doublecmd.git synced 2026-06-21 09:58:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

UPD: Quote file names when adding to command line.

Browse source
This commit is contained in:
cobines 2010-02-10 13:20:16 +00:00
commit 470e501dc5
2 changed files with 9 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/fmain.pas
View file

@ -3163,7 +3163,7 @@ begin
iIndex:= Pos('cd ', sCmd);
if iIndex = 1 then
begin
sDir:= Trim(Copy(sCmd, iIndex + 3, Length(sCmd)));
sDir:= Trim(RemoveQuotation(Copy(sCmd, iIndex + 3, Length(sCmd))));
sDir:= IncludeTrailingBackslash(sDir);
if Pos('~' + PathDelim, sDir) = 1 then
sDir:= StringReplace(sDir, '~' + PathDelim, GetHomeDir, []);

20
src/uacts.pas
View file

@ -715,12 +715,14 @@ end;
procedure TActs.cm_AddPathToCmdLine(param:string);
var
OldPosition: Integer;
AddedString: String;
begin
with frmMain do
begin
OldPosition := edtCommand.SelStart;
edtCommand.Text := edtCommand.Text + (ActiveFrame.CurrentPath);
edtCommand.SelStart := OldPosition + Length(ActiveFrame.CurrentPath);
AddedString := QuoteStr(ActiveFrame.CurrentPath);
edtCommand.Text := edtCommand.Text + AddedString;
edtCommand.SelStart := OldPosition + Length(AddedString);
end;
end;
@ -736,7 +738,7 @@ begin
if Assigned(aFile) then
begin
OldPosition := edtCommand.SelStart;
AddedString := aFile.Name + ' ';
AddedString := QuoteStr(aFile.Name) + ' ';
edtCommand.Text := edtCommand.Text + AddedString;
edtCommand.SelStart := OldPosition + Length(AddedString);
end;
@ -754,16 +756,10 @@ begin
aFile := ActiveFrame.ActiveFile;
if Assigned(aFile) then
begin
AddedString := ActiveFrame.CurrentPath;
if aFile.Name = '..' then
begin
AddedString := AddedString + ' ';
end
AddedString := QuoteStr(ActiveFrame.CurrentPath) + ' '
else
begin
AddedString := AddedString + aFile.Name + ' ';
end;
AddedString := QuoteStr(aFile.FullPath) + ' ';
OldPosition := edtCommand.SelStart;
edtCommand.Text := edtCommand.Text + AddedString;
@ -2714,4 +2710,4 @@ begin
end;
end.