From: Alexander Kornienko Date: Mon, 26 Mar 2018 13:54:17 +0000 (+0000) Subject: [clang-format] Wildcard expansion on Windows. X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5401c40e6e9c0a88a5add0fdc311304827674f50;p=clang [clang-format] Wildcard expansion on Windows. Summary: Add support for wildcard expansion in command line arguments on Windows. See https://docs.microsoft.com/en-us/cpp/c-language/expanding-wildcard-arguments Fixes https://bugs.llvm.org/show_bug.cgi?id=17217 Reviewers: klimek, djasper, rnk Reviewed By: rnk Subscribers: rnk, smeenai, zturner, alexfh, mgorny, cfe-commits Differential Revision: https://reviews.llvm.org/D44778 git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@328495 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/tools/clang-format/ClangFormat.cpp b/tools/clang-format/ClangFormat.cpp index 2718a72f43..2909cddf37 100644 --- a/tools/clang-format/ClangFormat.cpp +++ b/tools/clang-format/ClangFormat.cpp @@ -22,6 +22,7 @@ #include "clang/Rewrite/Core/Rewriter.h" #include "llvm/Support/CommandLine.h" #include "llvm/Support/FileSystem.h" +#include "llvm/Support/Process.h" #include "llvm/Support/Signals.h" using namespace llvm; @@ -339,11 +340,19 @@ static void PrintVersion(raw_ostream &OS) { int main(int argc, const char **argv) { llvm::sys::PrintStackTraceOnErrorSignal(argv[0]); + SmallVector Args; + llvm::SpecificBumpPtrAllocator ArgAllocator; + std::error_code EC = llvm::sys::Process::GetArgumentVector( + Args, llvm::makeArrayRef(argv, argc), ArgAllocator); + if (EC) { + llvm::errs() << "error: couldn't get arguments: " << EC.message() << '\n'; + } + cl::HideUnrelatedOptions(ClangFormatCategory); cl::SetVersionPrinter(PrintVersion); cl::ParseCommandLineOptions( - argc, argv, + Args.size(), &Args[0], "A tool to format C/C++/Java/JavaScript/Objective-C/Protobuf code.\n\n" "If no arguments are specified, it formats the code from standard input\n" "and writes the result to the standard output.\n"