llvm-strings: support the `-n` option
Permit specifying the match length (the `-n` or `--bytes` option). The
deprecated `-[length]` form is not supported as an option. This allows the
strings tool to display only the specified length strings rather than the
hardcoded default length of >= 4.
llvm-svn: 286914
diff --git a/llvm/tools/llvm-strings/llvm-strings.cpp b/llvm/tools/llvm-strings/llvm-strings.cpp
index cb0fb96..e750995 100644
--- a/llvm/tools/llvm-strings/llvm-strings.cpp
+++ b/llvm/tools/llvm-strings/llvm-strings.cpp
@@ -35,8 +35,15 @@
static cl::alias PrintFileNameShort("f", cl::desc(""),
cl::aliasopt(PrintFileName));
+static cl::opt<int>
+ MinLength("bytes", cl::desc("Print sequences of the specified length"),
+ cl::init(4));
+static cl::alias MinLengthShort("n", cl::desc(""), cl::aliasopt(MinLength));
+
static void strings(raw_ostream &OS, StringRef FileName, StringRef Contents) {
auto print = [&OS, FileName](StringRef L) {
+ if (L.size() < static_cast<size_t>(MinLength))
+ return;
if (PrintFileName)
OS << FileName << ": ";
OS << L << '\n';
@@ -48,12 +55,11 @@
if (S == nullptr)
S = P;
} else if (S) {
- if (P - S > 3)
- print(StringRef(S, P - S));
+ print(StringRef(S, P - S));
S = nullptr;
}
}
- if (S && E - S > 3)
+ if (S)
print(StringRef(S, E - S));
}
@@ -62,6 +68,10 @@
PrettyStackTraceProgram X(argc, argv);
cl::ParseCommandLineOptions(argc, argv, "llvm string dumper\n");
+ if (MinLength == 0) {
+ errs() << "invalid minimum string length 0\n";
+ return EXIT_FAILURE;
+ }
if (InputFileNames.empty())
InputFileNames.push_back("-");