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

Clang: Properly quote arguments

Browse Source 
Change-Id: Id51bc93de028429f18fca1638b1db4051880971b
Reviewed-by: David Schulz <david.schulz@qt.io>
This commit is contained in:
Nikolai Kosjar
2016-07-05 11:02:56 +02:00
parent 3ecbce9b84
commit 3e5937792e
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/tools/clangbackend/ipcsource/commandlinearguments.cpp
View File

@@ -28,6 +28,7 @@
#include "clangfilepath.h" #include "clangfilepath.h"
#include <utf8string.h> #include <utf8string.h>
#include <utils/qtcprocess.h>
#include <QByteArray> #include <QByteArray>
@@ -71,13 +72,10 @@ const char *CommandLineArguments::at(int position) const
static Utf8String maybeQuoted(const char *argumentAsCString) static Utf8String maybeQuoted(const char *argumentAsCString)
{ {
const auto quotationMark = Utf8StringLiteral("\""); const QString argumentAsQString = QString::fromUtf8(argumentAsCString);
const auto argument = Utf8String::fromUtf8(argumentAsCString); const QString quotedArgument = Utils::QtcProcess::quoteArg(argumentAsQString);
if (argument.contains(quotationMark)) return Utf8String::fromString(quotedArgument);
return argument;
return quotationMark + argument + quotationMark;
} }
void CommandLineArguments::print() const void CommandLineArguments::print() const