This is an archive of the discontinued LLVM Phabricator instance.

Differential D54193

[llvm-strip] Check "strip" with StringRef::contains instead of ends_with
ClosedPublic

Authored by MaskRay on Nov 6 2018, 5:52 PM.

Details

Reviewers
rupprecht
jhenderson
alexander-shaposhnikov
jakehehrlich
Commits
rG4a67035da24b: [llvm-strip] Check "strip" with StringRef::contains instead of ends_with
rL346292: [llvm-strip] Check "strip" with StringRef::contains instead of ends_with
Summary

If argv[0] is version suffixed, e.g. llvm-strip-7, this will still work.

Diff Detail

Revision Contents

PathSize
tools/
llvm-objcopy/
2 lines

Diff 172884

tools/llvm-objcopy/llvm-objcopy.cpp

Show First 20 Lines • Show All 213 Lines • ▼ Show 20 Lines if (!Config.SplitDWO.empty())
restoreDateOnFile(Config.SplitDWO, Stat); restoreDateOnFile(Config.SplitDWO, Stat);
} }
} }
int main(int argc, char **argv) { int main(int argc, char **argv) {
InitLLVM X(argc, argv); InitLLVM X(argc, argv);
ToolName = argv[0]; ToolName = argv[0];
DriverConfig DriverConfig; DriverConfig DriverConfig;
if (sys::path::stem(ToolName).endswith_lower("strip")) if (sys::path::stem(ToolName).contains("strip"))
DriverConfig = parseStripOptions(makeArrayRef(argv + 1, argc)); DriverConfig = parseStripOptions(makeArrayRef(argv + 1, argc));
else else
DriverConfig = parseObjcopyOptions(makeArrayRef(argv + 1, argc)); DriverConfig = parseObjcopyOptions(makeArrayRef(argv + 1, argc));
for (const CopyConfig &CopyConfig : DriverConfig.CopyConfigs) for (const CopyConfig &CopyConfig : DriverConfig.CopyConfigs)
executeObjcopy(CopyConfig); executeObjcopy(CopyConfig);
} }