diff options
| -rw-r--r-- | llvm/test/tools/llvm-strings/length.test | 24 | ||||
| -rw-r--r-- | llvm/tools/llvm-strings/llvm-strings.cpp | 16 |
2 files changed, 37 insertions, 3 deletions
diff --git a/llvm/test/tools/llvm-strings/length.test b/llvm/test/tools/llvm-strings/length.test new file mode 100644 index 00000000000..f64829dc885 --- /dev/null +++ b/llvm/test/tools/llvm-strings/length.test @@ -0,0 +1,24 @@ +RUN: sed -n 's/^STDIN: //p' %s | llvm-strings | FileCheck --check-prefix CHECK-DEFAULT %s +RUN: sed -n 's/^STDIN: //p' %s | not llvm-strings -n 0 2>&1 | FileCheck --check-prefix CHECK-0 %s +RUN: sed -n 's/^STDIN: //p' %s | llvm-strings -n 1 | FileCheck --check-prefix CHECK-1 %s +RUN: sed -n 's/^STDIN: //p' %s | llvm-strings -n 2 | FileCheck --check-prefix CHECK-2 %s + +STDIN: a +STDIN: ab +STDIN: abc +STDIN: abcd + +CHECK-DEFAULT: abcd + +CHECK-0: invalid minimum string length 0 + +CHECK-1: a +CHECK-1: ab +CHECK-1: abc +CHECK-1: abcd + +CHECK-2-NOT: a +CHECK-2: ab +CHECK-2: abc +CHECK-2: abcd + 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<bool> 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 @@ 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("-"); |
