[lld] r187390 - [PECOFF][Driver] Remove quotes from command line arguments.
Rui Ueyama
ruiu at google.com
Mon Jul 29 17:14:04 PDT 2013
On Mon, Jul 29, 2013 at 4:53 PM, Reid Kleckner <rnk at google.com> wrote:
> The correct unquoting mechanism is probably the one used by
> CommandLineToArgv(W).
>
> http://msdn.microsoft.com/en-us/library/windows/desktop/bb776391(v=vs.85).aspx
>
> http://msdn.microsoft.com/en-us/library/windows/desktop/17w5ykft(v=vs.85).aspx
>
> There's a FIXME to implement this algorithm in
> llvm/lib/Support/CommandLine.cpp in TokenizeWindowsCommandLine().
>
Thanks, Reid. I think that's what I needed for .drective section. I'll
implement that function.
>
> On Mon, Jul 29, 2013 at 4:32 PM, Rui Ueyama <ruiu at google.com> wrote:
>
>> Author: ruiu
>> Date: Mon Jul 29 18:32:22 2013
>> New Revision: 187390
>>
>> URL: http://llvm.org/viewvc/llvm-project?rev=187390&view=rev
>> Log:
>> [PECOFF][Driver] Remove quotes from command line arguments.
>>
>> The command line option in .drectve section may be quoted by double
>> quotes, and if that's the case we have to remove them.
>>
>> Modified:
>> lld/trunk/lib/Driver/WinLinkDriver.cpp
>> lld/trunk/unittests/DriverTests/WinLinkDriverTest.cpp
>>
>> Modified: lld/trunk/lib/Driver/WinLinkDriver.cpp
>> URL:
>> http://llvm.org/viewvc/llvm-project/lld/trunk/lib/Driver/WinLinkDriver.cpp?rev=187390&r1=187389&r2=187390&view=diff
>>
>> ==============================================================================
>> --- lld/trunk/lib/Driver/WinLinkDriver.cpp (original)
>> +++ lld/trunk/lib/Driver/WinLinkDriver.cpp Mon Jul 29 18:32:22 2013
>> @@ -216,6 +216,14 @@ std::vector<StringRef> splitPathList(Str
>> return std::move(ret);
>> }
>>
>> +// Removes surrounding single or double quotes from the string. If it's
>> not
>> +// quoted, return the argument as is.
>> +StringRef unquote(StringRef str) {
>> + bool isQuoted = (str.startswith("\"") && str.endswith("\"")) ||
>> + (str.startswith("'") && str.endswith("'"));
>> + return isQuoted ? str.substr(1, str.size() - 2) : str;
>> +}
>> +
>> // Handle /failifmatch option.
>> bool handleFailIfMismatchOption(StringRef option,
>> std::map<StringRef, StringRef>
>> &mustMatch,
>> @@ -345,33 +353,33 @@ bool WinLinkDriver::parse(int argc, cons
>>
>> // handle /base
>> if (llvm::opt::Arg *arg = parsedArgs->getLastArg(OPT_base))
>> - if (!parseBaseOption(info, arg->getValue(), diagnostics))
>> + if (!parseBaseOption(info, unquote(arg->getValue()), diagnostics))
>> return true;
>>
>> // handle /stack
>> if (llvm::opt::Arg *arg = parsedArgs->getLastArg(OPT_stack))
>> - if (!parseStackOption(info, arg->getValue(), diagnostics))
>> + if (!parseStackOption(info, unquote(arg->getValue()), diagnostics))
>> return true;
>>
>> // handle /heap
>> if (llvm::opt::Arg *arg = parsedArgs->getLastArg(OPT_heap))
>> - if (!parseHeapOption(info, arg->getValue(), diagnostics))
>> + if (!parseHeapOption(info, unquote(arg->getValue()), diagnostics))
>> return true;
>>
>> // handle /subsystem
>> if (llvm::opt::Arg *arg = parsedArgs->getLastArg(OPT_subsystem))
>> - if (!parseSubsystemOption(info, arg->getValue(), diagnostics))
>> + if (!parseSubsystemOption(info, unquote(arg->getValue()),
>> diagnostics))
>> return true;
>>
>> // handle /entry
>> if (llvm::opt::Arg *arg = parsedArgs->getLastArg(OPT_entry))
>> - info.setEntrySymbolName(arg->getValue());
>> + info.setEntrySymbolName(unquote(arg->getValue()));
>>
>> // handle /libpath
>> for (llvm::opt::arg_iterator it =
>> parsedArgs->filtered_begin(OPT_libpath),
>> ie = parsedArgs->filtered_end();
>> it != ie; ++it) {
>> - info.appendInputSearchPath((*it)->getValue());
>> + info.appendInputSearchPath(unquote((*it)->getValue()));
>> }
>>
>> // handle /force
>> @@ -398,19 +406,19 @@ bool WinLinkDriver::parse(int argc, cons
>> for (llvm::opt::arg_iterator it = parsedArgs->filtered_begin(OPT_incl),
>> ie = parsedArgs->filtered_end();
>> it != ie; ++it) {
>> - info.addInitialUndefinedSymbol((*it)->getValue());
>> + info.addInitialUndefinedSymbol(unquote((*it)->getValue()));
>> }
>>
>> // handle /out
>> if (llvm::opt::Arg *outpath = parsedArgs->getLastArg(OPT_out))
>> - info.setOutputPath(outpath->getValue());
>> + info.setOutputPath(unquote(outpath->getValue()));
>>
>> // handle /defaultlib
>> std::vector<StringRef> defaultLibs;
>> for (llvm::opt::arg_iterator it =
>> parsedArgs->filtered_begin(OPT_defaultlib),
>> ie = parsedArgs->filtered_end();
>> it != ie; ++it) {
>> - defaultLibs.push_back((*it)->getValue());
>> + defaultLibs.push_back(unquote((*it)->getValue()));
>> }
>>
>> // Handle /failifmismatch. /failifmismatch is the hidden linker option
>> behind
>> @@ -426,7 +434,8 @@ bool WinLinkDriver::parse(int argc, cons
>> it = parsedArgs->filtered_begin(OPT_failifmismatch),
>> ie = parsedArgs->filtered_end();
>> it != ie; ++it) {
>> - if (!handleFailIfMismatchOption((*it)->getValue(), mustMatch,
>> diagnostics))
>> + if (!handleFailIfMismatchOption(unquote((*it)->getValue()),
>> + mustMatch, diagnostics))
>> return true;
>> }
>>
>> @@ -435,13 +444,13 @@ bool WinLinkDriver::parse(int argc, cons
>> for (llvm::opt::arg_iterator it =
>> parsedArgs->filtered_begin(OPT_INPUT),
>> ie = parsedArgs->filtered_end();
>> it != ie; ++it) {
>> - inputPaths.push_back((*it)->getValue());
>> + inputPaths.push_back(unquote((*it)->getValue()));
>> }
>>
>> // Arguments after "--" are also input files
>> if (doubleDashPosition > 0)
>> for (int i = doubleDashPosition + 1; i < argc; ++i)
>> - inputPaths.push_back(argv[i]);
>> + inputPaths.push_back(unquote(argv[i]));
>>
>> // Add input files specified via the command line.
>> for (const StringRef path : inputPaths)
>>
>> Modified: lld/trunk/unittests/DriverTests/WinLinkDriverTest.cpp
>> URL:
>> http://llvm.org/viewvc/llvm-project/lld/trunk/unittests/DriverTests/WinLinkDriverTest.cpp?rev=187390&r1=187389&r2=187390&view=diff
>>
>> ==============================================================================
>> --- lld/trunk/unittests/DriverTests/WinLinkDriverTest.cpp (original)
>> +++ lld/trunk/unittests/DriverTests/WinLinkDriverTest.cpp Mon Jul 29
>> 18:32:22 2013
>> @@ -66,6 +66,16 @@ TEST_F(WinLinkParserTest, UnixStyleOptio
>> EXPECT_EQ("a.obj", inputFile(0));
>> }
>>
>> +TEST_F(WinLinkParserTest, Quote) {
>> + EXPECT_FALSE(parse("link.exe", "/subsystem:\"console\"",
>> "-out:'a.exe'",
>> + "/defaultlib:'user32.lib'", "'a.obj'", nullptr));
>> + EXPECT_EQ(llvm::COFF::IMAGE_SUBSYSTEM_WINDOWS_CUI,
>> _info.getSubsystem());
>> + EXPECT_EQ("a.exe", _info.outputPath());
>> + EXPECT_EQ(2, inputFileCount());
>> + EXPECT_EQ("a.obj", inputFile(0));
>> + EXPECT_EQ("user32.lib", inputFile(1));
>> +}
>> +
>> TEST_F(WinLinkParserTest, Mllvm) {
>> EXPECT_FALSE(parse("link.exe", "-mllvm", "-debug", "a.obj", nullptr));
>> const std::vector<const char *> &options = _info.llvmOptions();
>> @@ -205,7 +215,7 @@ TEST_F(WinLinkParserTest, NoInputFiles)
>>
>> TEST_F(WinLinkParserTest, FailIfMismatch_Match) {
>> EXPECT_FALSE(parse("link.exe", "/failifmismatch:foo=bar",
>> - "/failifmismatch:foo=bar",
>> "/failifmismatch:abc=def",
>> + "/failifmismatch:\"foo=bar\"",
>> "/failifmismatch:abc=def",
>> "a.out", nullptr));
>> }
>>
>>
>>
>> _______________________________________________
>> llvm-commits mailing list
>> llvm-commits at cs.uiuc.edu
>> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
>>
>
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20130729/aafc7952/attachment.html>
More information about the llvm-commits
mailing list