diff options
| author | Elliott Hughes <enh@google.com> | 2016-04-16 08:19:23 -0700 |
|---|---|---|
| committer | Rob Landley <rob@landley.net> | 2016-04-16 20:00:46 -0500 |
| commit | e57cb179608077b7459b95bb3219035dd0045912 (patch) | |
| tree | 37df168a1ef79a57ebf85af0731e48e3ec98495b | |
| parent | 00a60fcaa318a437ab66d9a6bd6c065a019a8fad (diff) | |
| download | toybox-e57cb179608077b7459b95bb3219035dd0045912.tar.gz | |
Fix tail -NUM again.
This time with a test.
| -rwxr-xr-x | tests/tail.test | 1 | ||||
| -rw-r--r-- | toys/posix/tail.c | 6 |
2 files changed, 4 insertions, 3 deletions
diff --git a/tests/tail.test b/tests/tail.test index c1c44c6a..81dc871f 100755 --- a/tests/tail.test +++ b/tests/tail.test @@ -20,6 +20,7 @@ testing "-c out of bounds" "tail -c 999 file1" "$BIGTEST" "" "" testing "-c+ in bounds" "tail -c +27 file1" \ "x\nseven\neight\nnine\nten\neleven\n" "" "" testing "-c+ out of bonds" "tail -c +999 file1" "" "" "" +testing "-N" "tail -1 file1" "eleven\n" "" "" rm file1 testing "stdin no trailing newline" "tail -n 1 - " "c" "" "a\nb\nc" diff --git a/toys/posix/tail.c b/toys/posix/tail.c index 1204f1c6..787e116e 100644 --- a/toys/posix/tail.c +++ b/toys/posix/tail.c @@ -231,10 +231,10 @@ void tail_main(void) if (arg && *arg == '-' && arg[1]) { TT.lines = atolx(*(args++)); toys.optc--; + } else { + // if nothing specified, default -n to -10 + TT.lines = -10; } - - // if nothing specified, default -n to -10 - TT.lines = -10; } // Allocate 2 ints per optarg for -f |