[llvm-strings] Fix whitespaces to match strings output.

[rupprecht]

Summary

The current implementation prepends a space on every line, making it difficult to compare against GNU strings.

The space appears to have come from handling --radix in rL292707. The space is for making sure there's a space between the radix and the value; however the space is still emitted even when there is no radix. This change fixes that so the space is only emitted when there is a radix.

[jhenderson]

Could you add a test for --radix + --print-file-name, please, as the interaction could have changed with your implementation too. Otherwise looks good.

[rupprecht]

• Add radix+filename test

[jhenderson]

LGTM.

test/tools/llvm-strings/radix-filename.test

2 ↗

(On Diff #173200)

Nit: Use --check-prefix instead of -check-prefix for consistency with --strict-whitespace.

[rupprecht]

fix test flags

llvm/trunk/test/tools/llvm-strings/file-filename.test

 RUN: llvm-strings -f %S/Inputs/abcd | FileCheck %s
-RUN: llvm-strings --print-file-name %S/Inputs/abcd | FileCheck %s
+RUN: llvm-strings --print-file-name %S/Inputs/abcd | FileCheck %s --strict-whitespace
 CHECK: {{[\\/]}}abcd: abcd

llvm/trunk/test/tools/llvm-strings/negative-char.test

 # RUN: echo -e "z\0\x80\0a\0" | llvm-strings --bytes 1 - | FileCheck %s
 # CHECK: z{{$}}
-# CHECK-NEXT: {{^}} a
+# CHECK-NEXT: {{^}}a

llvm/trunk/test/tools/llvm-strings/radix-filename.test

+RUN: llvm-strings --print-file-name %S/Inputs/numbers \
+RUN:     | FileCheck %s --check-prefix CHECK-NONE
+RUN: llvm-strings --print-file-name -t d %S/Inputs/numbers \
+RUN:    | FileCheck %s --check-prefix CHECK-DEC --strict-whitespace
+RUN: llvm-strings --print-file-name -t o %S/Inputs/numbers \
+RUN:     | FileCheck %s --check-prefix CHECK-OCT --strict-whitespace
+RUN: llvm-strings --print-file-name -t x %S/Inputs/numbers \
+RUN:     | FileCheck %s --check-prefix CHECK-HEX --strict-whitespace
+
+CHECK-NONE: numbers: three
+CHECK-NONE: numbers: four
+CHECK-NONE: numbers: five
+CHECK-NONE: numbers: seven
+CHECK-NONE: numbers: eight
+CHECK-NONE: numbers: nine
+
+CHECK-DEC: numbers:       8 three
+CHECK-DEC: numbers:      14 four
+CHECK-DEC: numbers:      19 five
+CHECK-DEC: numbers:      28 seven
+CHECK-DEC: numbers:      34 eight
+CHECK-DEC: numbers:      40 nine
+
+CHECK-OCT: numbers:      10 three
+CHECK-OCT: numbers:      16 four
+CHECK-OCT: numbers:      23 five
+CHECK-OCT: numbers:      34 seven
+CHECK-OCT: numbers:      42 eight
+CHECK-OCT: numbers:      50 nine
+
+CHECK-HEX: numbers:       8 three
+CHECK-HEX: numbers:       e four
+CHECK-HEX: numbers:      13 five
+CHECK-HEX: numbers:      1c seven
+CHECK-HEX: numbers:      22 eight
+CHECK-HEX: numbers:      28 nine

llvm/trunk/test/tools/llvm-strings/radix.test

 RUN: llvm-strings %S/Inputs/numbers | FileCheck %s -check-prefix CHECK-NONE
-RUN: llvm-strings -t d %S/Inputs/numbers | FileCheck %s -check-prefix CHECK-DEC
-RUN: llvm-strings -t o %S/Inputs/numbers | FileCheck %s -check-prefix CHECK-OCT
-RUN: llvm-strings -t x %S/Inputs/numbers | FileCheck %s -check-prefix CHECK-HEX
+RUN: llvm-strings -t d %S/Inputs/numbers | FileCheck %s -check-prefix CHECK-DEC --strict-whitespace
+RUN: llvm-strings -t o %S/Inputs/numbers | FileCheck %s -check-prefix CHECK-OCT --strict-whitespace
+RUN: llvm-strings -t x %S/Inputs/numbers | FileCheck %s -check-prefix CHECK-HEX --strict-whitespace
 
-CHECK-NONE: three
-CHECK-NONE: four
-CHECK-NONE: five
-CHECK-NONE: seven
-CHECK-NONE: eight
-CHECK-NONE: nine
+CHECK-NONE: {{^}}three
+CHECK-NONE: {{^}}four
+CHECK-NONE: {{^}}five
+CHECK-NONE: {{^}}seven
+CHECK-NONE: {{^}}eight
+CHECK-NONE: {{^}}nine
 
-CHECK-DEC:      8 three
-CHECK-DEC:     14 four
-CHECK-DEC:     19 five
-CHECK-DEC:     28 seven
-CHECK-DEC:     34 eight
-CHECK-DEC:     40 nine
+CHECK-DEC: {{^}}      8 three
+CHECK-DEC: {{^}}     14 four
+CHECK-DEC: {{^}}     19 five
+CHECK-DEC: {{^}}     28 seven
+CHECK-DEC: {{^}}     34 eight
+CHECK-DEC: {{^}}     40 nine
 
-CHECK-OCT:     10 three
-CHECK-OCT:     16 four
-CHECK-OCT:     23 five
-CHECK-OCT:     34 seven
-CHECK-OCT:     42 eight
-CHECK-OCT:     50 nine
-
-CHECK-HEX:      8 three
-CHECK-HEX:      e four
-CHECK-HEX:     13 five
-CHECK-HEX:     1c seven
-CHECK-HEX:     22 eight
-CHECK-HEX:     28 nine
+CHECK-OCT: {{^}}     10 three
+CHECK-OCT: {{^}}     16 four
+CHECK-OCT: {{^}}     23 five
+CHECK-OCT: {{^}}     34 seven
+CHECK-OCT: {{^}}     42 eight
+CHECK-OCT: {{^}}     50 nine
 
+CHECK-HEX: {{^}}      8 three
+CHECK-HEX: {{^}}      e four
+CHECK-HEX: {{^}}     13 five
+CHECK-HEX: {{^}}     1c seven
+CHECK-HEX: {{^}}     22 eight
+CHECK-HEX: {{^}}     28 nine

llvm/trunk/test/tools/llvm-strings/whitespace.test

+RUN: echo -n abcd | llvm-strings - | FileCheck %s --strict-whitespace
+CHECK: {{^}}abcd{{$}}

llvm/trunk/tools/llvm-strings/llvm-strings.cpp

Radix("radix", cl::desc("print the offset within the file"),
           cl::init(none));
 static cl::alias RadixShort("t", cl::desc(""), cl::aliasopt(Radix));
 
 static void strings(raw_ostream &OS, StringRef FileName, StringRef Contents) {
   auto print = [&OS, FileName](unsigned Offset, StringRef L) {
     if (L.size() < static_cast<size_t>(MinLength))
       return;
     if (PrintFileName)
-      OS << FileName << ":";
+      OS << FileName << ": ";
     switch (Radix) {
     case none:
       break;
     case octal:
-      OS << format("%8o", Offset);
+      OS << format("%7o ", Offset);
       break;
     case hexadecimal:
-      OS << format("%8x", Offset);
+      OS << format("%7x ", Offset);
       break;
     case decimal:
-      OS << format("%8u", Offset);
+      OS << format("%7u ", Offset);
       break;
     }
-    OS << " " << L << '\n';
+    OS << L << '\n';
   };
 
   const char *B = Contents.begin();
   const char *P = nullptr, *E = nullptr, *S = nullptr;
   for (P = Contents.begin(), E = Contents.end(); P < E; ++P) {
     if (isPrint(*P) || *P == '\t') {
       if (S == nullptr)
         S = P;