Skip to content

[llvm-config] Quote and escape paths #97305

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jul 3, 2024
Merged

[llvm-config] Quote and escape paths #97305

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b40d654
[llvm-config] Quote and escape paths if necessary
aganea Jul 1, 2024
cb2629e
Simplify
aganea Jul 1, 2024
e02fdff
Fix test and add release notes
aganea Jul 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
49 changes: 33 additions & 16 deletions llvm/tools/llvm-config/llvm-config.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
#include "llvm/Config/config.h"
#include "llvm/Support/FileSystem.h"
#include "llvm/Support/Path.h"
#include "llvm/Support/Program.h"
#include "llvm/Support/WithColor.h"
#include "llvm/Support/raw_ostream.h"
#include "llvm/TargetParser/Triple.h"
Expand Down Expand Up @@ -352,8 +353,11 @@ int main(int argc, char **argv) {
}

// We need to include files from both the source and object trees.
ActiveIncludeOption =
("-I" + ActiveIncludeDir + " " + "-I" + ActiveObjRoot + "/include");
raw_string_ostream OS(ActiveIncludeOption);
OS << "-I";
sys::printArg(OS, ActiveIncludeDir, /*Quote=*/true);
OS << " -I";
sys::printArg(OS, ActiveObjRoot + "/include", /*Quote=*/true);
} else {
ActivePrefix = CurrentExecPrefix;
{
Expand All @@ -372,7 +376,9 @@ int main(int argc, char **argv) {
sys::fs::make_absolute(ActivePrefix, Path);
ActiveCMakeDir = std::string(Path);
}
ActiveIncludeOption = "-I" + ActiveIncludeDir;
raw_string_ostream OS(ActiveIncludeOption);
OS << "-I";
sys::printArg(OS, ActiveIncludeDir, /*Quote=*/true);
}

/// We only use `shared library` mode in cases where the static library form
Expand Down Expand Up @@ -512,24 +518,30 @@ int main(int argc, char **argv) {
if (Arg == "--version") {
OS << PACKAGE_VERSION << '\n';
} else if (Arg == "--prefix") {
OS << ActivePrefix << '\n';
sys::printArg(OS, ActivePrefix, /*Quote=*/true);
OS << '\n';
} else if (Arg == "--bindir") {
OS << ActiveBinDir << '\n';
sys::printArg(OS, ActiveBinDir, /*Quote=*/true);
OS << '\n';
} else if (Arg == "--includedir") {
OS << ActiveIncludeDir << '\n';
sys::printArg(OS, ActiveIncludeDir, /*Quote=*/true);
OS << '\n';
} else if (Arg == "--libdir") {
OS << ActiveLibDir << '\n';
sys::printArg(OS, ActiveLibDir, /*Quote=*/true);
OS << '\n';
} else if (Arg == "--cmakedir") {
OS << ActiveCMakeDir << '\n';
sys::printArg(OS, ActiveCMakeDir, /*Quote=*/true);
OS << '\n';
} else if (Arg == "--cppflags") {
OS << ActiveIncludeOption << ' ' << LLVM_CPPFLAGS << '\n';
} else if (Arg == "--cflags") {
OS << ActiveIncludeOption << ' ' << LLVM_CFLAGS << '\n';
} else if (Arg == "--cxxflags") {
OS << ActiveIncludeOption << ' ' << LLVM_CXXFLAGS << '\n';
} else if (Arg == "--ldflags") {
OS << ((HostTriple.isWindowsMSVCEnvironment()) ? "-LIBPATH:" : "-L")
<< ActiveLibDir << ' ' << LLVM_LDFLAGS << '\n';
OS << ((HostTriple.isWindowsMSVCEnvironment()) ? "-LIBPATH:" : "-L");
sys::printArg(OS, ActiveLibDir, /*Quote=*/true);
OS << ' ' << LLVM_LDFLAGS << '\n';
} else if (Arg == "--system-libs") {
PrintSystemLibs = true;
} else if (Arg == "--libs") {
Expand Down Expand Up @@ -590,7 +602,8 @@ int main(int argc, char **argv) {
} else if (Arg == "--shared-mode") {
PrintSharedMode = true;
} else if (Arg == "--obj-root") {
OS << ActivePrefix << '\n';
sys::printArg(OS, ActivePrefix, /*Quote=*/true);
OS << '\n';
} else if (Arg == "--ignore-libllvm") {
LinkDyLib = false;
LinkMode = BuiltSharedLibs ? LinkModeShared : LinkModeAuto;
Expand Down Expand Up @@ -695,26 +708,30 @@ int main(int argc, char **argv) {

auto PrintForLib = [&](const StringRef &Lib) {
const bool Shared = LinkMode == LinkModeShared;
std::string LibFileName;
if (PrintLibNames) {
OS << GetComponentLibraryFileName(Lib, Shared);
LibFileName = GetComponentLibraryFileName(Lib, Shared);
} else if (PrintLibFiles) {
OS << GetComponentLibraryPath(Lib, Shared);
LibFileName = GetComponentLibraryPath(Lib, Shared);
} else if (PrintLibs) {
// On Windows, output full path to library without parameters.
// Elsewhere, if this is a typical library name, include it using -l.
if (HostTriple.isWindowsMSVCEnvironment()) {
OS << GetComponentLibraryPath(Lib, Shared);
LibFileName = GetComponentLibraryPath(Lib, Shared);
} else {
OS << "-l";
StringRef LibName;
if (GetComponentLibraryNameSlice(Lib, LibName)) {
// Extract library name (remove prefix and suffix).
OS << "-l" << LibName;
LibFileName = LibName;
} else {
// Lib is already a library name without prefix and suffix.
OS << "-l" << Lib;
LibFileName = Lib;
}
}
}
if (!LibFileName.empty())
sys::printArg(OS, LibFileName, /*Quote=*/true);
};

if (LinkMode == LinkModeShared && LinkDyLib) {
Expand Down