Browse Source

Merge pull request #5408 from Chocobo1/run_ext

Fix external program command too long error in Windows
adaptive-webui-19844
sledgehammer999 9 years ago committed by GitHub
parent
commit
53e3f8a239
  1. 13
      src/app/application.cpp

13
src/app/application.cpp

@ -261,9 +261,16 @@ void Application::runExternalProgram(BitTorrent::TorrentHandle *const torrent) c
#if defined(Q_OS_UNIX) #if defined(Q_OS_UNIX)
QProcess::startDetached(QLatin1String("/bin/sh"), {QLatin1String("-c"), program}); QProcess::startDetached(QLatin1String("/bin/sh"), {QLatin1String("-c"), program});
#elif defined(Q_OS_WIN) // test cmd: `echo "%F" > "c:\ab ba.txt"` #elif defined(Q_OS_WIN) // test cmd: `echo "%F" > "c:\ab ba.txt"`
program.prepend(QLatin1String("cmd.exe /C ")); static const QString cmdPath = []() -> QString {
if (program.size() >= MAX_PATH) { WCHAR systemPath[64] = {0};
logger->addMessage(tr("Torrent: %1, run external program command too long (length > %2), execution failed.").arg(torrent->name()).arg(MAX_PATH), Log::CRITICAL); GetSystemDirectoryW(systemPath, sizeof(systemPath) / sizeof(WCHAR));
return QString::fromWCharArray(systemPath) + QLatin1String("\\cmd.exe /C ");
}();
program.prepend(QLatin1String("\"")).append(QLatin1String("\""));
program.prepend(cmdPath);
const uint cmdMaxLength = 32768; // max length (incl. terminate char) for `lpCommandLine` in `CreateProcessW()`
if ((program.size() + 1) > cmdMaxLength) {
logger->addMessage(tr("Torrent: %1, run external program command too long (length > %2), execution failed.").arg(torrent->name()).arg(cmdMaxLength), Log::CRITICAL);
return; return;
} }

Loading…
Cancel
Save