Fix wc column widths.

2 files changed, 9 insertions, 5 deletions

diff --git a/tests/wc.test b/tests/wc.test
index f4431729..8b6365b1 100755
--- a/tests/wc.test
+++ b/tests/wc.test
@@ -17,7 +17,7 @@ testing "standard input" "wc" "      1       3       5\n" "" "a b\nc"
 testing "-c" "wc -c file1" "26 file1\n" "" ""
 testing "-l" "wc -l file1" "4 file1\n" "" ""
 testing "-w" "wc -w file1" "5 file1\n" "" ""
-NOSPACE=1 testing "format" "wc file1" " 4 5 26 file1\n" "" ""
+testing "format" "wc file1" "4 5 26 file1\n" "" ""
 testing "multiple files" "wc input - file1" \
         "      1       2       3 input\n      0       2       3 -\n      4       5      26 file1\n      5       9      32 total\n" "a\nb" "a b"
 
@@ -25,7 +25,7 @@ testing "multiple files" "wc input - file1" \
 echo -n " " > file1
 for i in $(seq 1 512); do echo -n "üüüüüüüüüüüüüüüü" >> file1; done
 testing "-m" "wc -m file1" "8193 file1\n" "" ""
-testing "-m 2" 'cat "$FILES/utf8/test2.txt" | wc -m' "169\n" "" ""
+testing "-m 2" 'cat "$FILES/utf8/test2.txt" | wc -m' "    169\n" "" ""
 echo -n " " > file1
-NOSPACE=1 testing "-mlw" "wc -mlw input" " 1 2 11 input\n" "hello, 世界!\n" ""
+testing "-mlw" "wc -mlw input" "1 2 11 input\n" "hello, 世界!\n" ""
 rm file1
diff --git a/toys/posix/wc.c b/toys/posix/wc.c
index 69c5f382..acd0b3a0 100644
--- a/toys/posix/wc.c
+++ b/toys/posix/wc.c
@@ -33,9 +33,13 @@ GLOBALS(
 
 static void show_lengths(unsigned long *lengths, char *name)
 {
-  int i, space = 7, first = 1;
+  int i, space, first = 1;
+
+  // POSIX says there should never be leading spaces, but accepts that
+  // traditional implementations use 7 spaces, unless only one file
+  // is being counted, when there should be no leading spaces.
+  space = (toys.optc != 1) ? 7 : 0;
 
-  for (i = 0; i<4; i++) if (toys.optflags == (1<<i)) space = 0;
   for (i = 0; i<4; i++) {
     if (toys.optflags&(1<<i)) {
       printf(" %*ld"+first, space, lengths[i]);