From f7009b42f8a9d916f0ed69274089fae32e5a1bbc Mon Sep 17 00:00:00 2001 From: Saleem Abdulrasool Date: Tue, 15 Nov 2016 00:43:52 +0000 Subject: 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 --- llvm/tools/llvm-strings/llvm-strings.cpp | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) (limited to 'llvm/tools/llvm-strings') diff --git a/llvm/tools/llvm-strings/llvm-strings.cpp b/llvm/tools/llvm-strings/llvm-strings.cpp index cb0fb9651d9..e750995331e 100644 --- a/llvm/tools/llvm-strings/llvm-strings.cpp +++ b/llvm/tools/llvm-strings/llvm-strings.cpp @@ -35,8 +35,15 @@ static cl::opt static cl::alias PrintFileNameShort("f", cl::desc(""), cl::aliasopt(PrintFileName)); +static cl::opt + 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(MinLength)) + return; if (PrintFileName) OS << FileName << ": "; OS << L << '\n'; @@ -48,12 +55,11 @@ static void strings(raw_ostream &OS, StringRef FileName, StringRef Contents) { 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 @@ int main(int argc, char **argv) { 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("-"); -- cgit v1.2.3