summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--llvm/test/tools/llvm-strings/terminator-neg.test2
-rw-r--r--llvm/test/tools/llvm-strings/terminator.test2
-rw-r--r--llvm/tools/llvm-strings/llvm-strings.cpp6
3 files changed, 8 insertions, 2 deletions
diff --git a/llvm/test/tools/llvm-strings/terminator-neg.test b/llvm/test/tools/llvm-strings/terminator-neg.test
new file mode 100644
index 00000000000..cdcf52498f6
--- /dev/null
+++ b/llvm/test/tools/llvm-strings/terminator-neg.test
@@ -0,0 +1,2 @@
+RUN: echo -n abc | llvm-strings - | FileCheck -allow-empty %s
+CHECK-NOT: abc
diff --git a/llvm/test/tools/llvm-strings/terminator.test b/llvm/test/tools/llvm-strings/terminator.test
new file mode 100644
index 00000000000..d27eeebe2e7
--- /dev/null
+++ b/llvm/test/tools/llvm-strings/terminator.test
@@ -0,0 +1,2 @@
+RUN: echo -n abcdefg | llvm-strings - | FileCheck %s
+CHECK: abcdefg
diff --git a/llvm/tools/llvm-strings/llvm-strings.cpp b/llvm/tools/llvm-strings/llvm-strings.cpp
index d590b7012b6..dbabf08a52f 100644
--- a/llvm/tools/llvm-strings/llvm-strings.cpp
+++ b/llvm/tools/llvm-strings/llvm-strings.cpp
@@ -33,8 +33,8 @@ static cl::list<std::string> InputFileNames(cl::Positional,
cl::ZeroOrMore);
static void dump(raw_ostream &OS, StringRef Contents) {
- const char *S = nullptr;
- for (const char *P = Contents.begin(), *E = Contents.end(); P < E; ++P) {
+ const char *P = nullptr, *E = nullptr, *S = nullptr;
+ for (P = Contents.begin(), E = Contents.end(); P < E; ++P) {
if (std::isgraph(*P) || std::isblank(*P)) {
if (S == nullptr)
S = P;
@@ -44,6 +44,8 @@ static void dump(raw_ostream &OS, StringRef Contents) {
S = nullptr;
}
}
+ if (S && E - S > 3)
+ OS << StringRef(S, E - S) << '\n';
}
namespace {
OpenPOWER on IntegriCloud