Re: [TSVN] Improper quoting when running external diff/merge?

Brian Wong wrote:

> I have some odd quoting behavior to report.
[snip]
> The offending code seems to be in /trunk/src/TortoiseProc/Utils.cpp in
> CUtils::StartExtDiff() (and similar code in CUtils::StartExtMerge()) as
> follows:
>
> // is there an extension specific diff tool?
> CRegString difftool(_T("Software\\TortoiseSVN\\DiffTools\\") +
> file2.GetFileExtension().MakeLower());
> if (CString(difftool) != "")
> {
> viewer = difftool;
> viewer = _T("\"") + viewer + _T("\"");
> }
>
> If I'm reading this right, it reads the registry key which contains
> "C:\bin\externaldiff.exe %base %mine", then it quotes the entire string.
> However it looks like it should be quoting only the executable.
>
> If I may suggest a fix, either:
> * Separate the program name and parameters into separate fields, OR
> * Don't quote the string.

Thanks for the report - fixed in revision 2765.

Stefan

-- 
        ___
   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.tigris.org
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org