diff options
| author | Elliott Hughes <enh@google.com> | 2019-09-04 10:51:17 -0700 |
|---|---|---|
| committer | Rob Landley <rob@landley.net> | 2019-09-04 15:54:44 -0500 |
| commit | 935980346f62febe9ed2bf029b55e0111fe1b073 (patch) | |
| tree | 11cc428b3558b60a7f7d09eb57bbda16dbfa4bb3 | |
| parent | 5be1c0ff22b55887b4d82c2cbbff79d9b5f45791 (diff) | |
| download | toybox-935980346f62febe9ed2bf029b55e0111fe1b073.tar.gz | |
ls: fix -Z, add a test.
This broke a netd test (but sadly in postsubmit rather than presubmit).
Also add a trivial test that would at least have caught this bug.
Bug: http://b/140453237
| -rwxr-xr-x | tests/ls.test | 1 | ||||
| -rw-r--r-- | toys/posix/ls.c | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/tests/ls.test b/tests/ls.test index 6c8e0efe..cba0a3de 100755 --- a/tests/ls.test +++ b/tests/ls.test @@ -31,6 +31,7 @@ testing "with -k" "$IN && ls -k; $OUT" "dir1\ndir2\nfile1.txt\nfile2.txt\n" "" " testing "with -m" "$IN && ls -m; $OUT" "dir1, dir2, file1.txt, file2.txt\n" "" "" testing "with -F" "$IN && ls -F; $OUT" "dir1/\ndir2/\nfile1.txt\nfile2.txt\n" "" "" testing "with -dk *" "$IN && ls -dk *; $OUT" "dir1\ndir2\nfile1.txt\nfile2.txt\n" "" "" +testing "with -Z" "$IN && ls -Z file1.txt | egrep -q '^[^ ]+ file1.txt' || echo fail; $OUT" "" "" "" ln -s file1.txt lstest/slink testing "-l symlink" \ diff --git a/toys/posix/ls.c b/toys/posix/ls.c index 65031587..25b77ad7 100644 --- a/toys/posix/ls.c +++ b/toys/posix/ls.c @@ -467,7 +467,7 @@ static void listfiles(int dirfd, struct dirtree *indir) } } if (flags & FLAG_Z) - printf(" %-*s", -(int)totals[7], (char *)sort[next]->extra); + printf("%-*s ", -(int)totals[7], (char *)sort[next]->extra); if (flags & (FLAG_l|FLAG_o|FLAG_n|FLAG_g)) { struct tm *tm; |