feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

VCS: Quote command-line arguments

Browse Source 
Change-Id: I49e776abe769b70d8003483215a4dbe31f60377b
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
This commit is contained in:
Orgad Shaneh
2017-05-15 09:00:56 +03:00
committed by Orgad Shaneh
parent 964dd4a3e1
commit f19de84e57
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/plugins/vcsbase/vcsoutputwindow.cpp
View File

@@ -32,6 +32,7 @@
#include <coreplugin/outputwindow.h> #include <coreplugin/outputwindow.h>
#include <utils/fileutils.h> #include <utils/fileutils.h>
#include <utils/outputformatter.h> #include <utils/outputformatter.h>
#include <utils/qtcprocess.h>
#include <utils/theme/theme.h> #include <utils/theme/theme.h>
#include <QPlainTextEdit> #include <QPlainTextEdit>
@@ -434,12 +435,12 @@ static inline QString formatArguments(const QStringList &args)
if (i) if (i)
str << ' '; str << ' ';
if (arg.startsWith(QString::fromLatin1(passwordOptionC) + QLatin1Char('='))) { if (arg.startsWith(QString::fromLatin1(passwordOptionC) + QLatin1Char('='))) {
str << "--password=********"; str << Utils::QtcProcess::quoteArg("--password=********");
continue; continue;
} }
str << arg; str << Utils::QtcProcess::quoteArg(arg);
if (arg == QLatin1String(passwordOptionC)) { if (arg == QLatin1String(passwordOptionC)) {
str << " ********"; str << ' ' << Utils::QtcProcess::quoteArg("********");
i++; i++;
} }
} }
@@ -451,7 +452,7 @@ QString VcsOutputWindow::msgExecutionLogEntry(const QString &workingDir,
const QStringList &arguments) const QStringList &arguments)
{ {
const QString args = formatArguments(arguments); const QString args = formatArguments(arguments);
const QString nativeExecutable = executable.toUserOutput(); const QString nativeExecutable = Utils::QtcProcess::quoteArg(executable.toUserOutput());
if (workingDir.isEmpty()) if (workingDir.isEmpty())
return tr("Running: %1 %2").arg(nativeExecutable, args) + QLatin1Char('\n'); return tr("Running: %1 %2").arg(nativeExecutable, args) + QLatin1Char('\n');
return tr("Running in %1: %2 %3"). return tr("Running in %1: %2 %3").