diff options
author | Ron Yorston <rmy@pobox.com> | 2021-01-21 08:40:54 +0000 |
---|---|---|
committer | Denys Vlasenko <vda.linux@googlemail.com> | 2021-02-02 17:37:41 +0100 |
commit | c849e72c0b216578f96b763529c5e58056d0662c (patch) | |
tree | 2f1cb9320218a0e471ea8924d315e981470d4cc9 /libbb | |
parent | 27ae859c50b6eedb9f43e21cdc774a2fefd726e1 (diff) | |
download | busybox-w32-c849e72c0b216578f96b763529c5e58056d0662c.tar.gz busybox-w32-c849e72c0b216578f96b763529c5e58056d0662c.tar.bz2 busybox-w32-c849e72c0b216578f96b763529c5e58056d0662c.zip |
nl: ensure '-b n' option displays file content
The command 'nl -b n' should output no line numbers, just some
spaces as a placeholder followed by the actual file content.
Add tests for line numbering by cat and nl. The correct results
were obtained from coreutils.
function old new delta
print_numbered_lines 152 157 +5
.rodata 182456 182453 -3
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 1/1 up/down: 5/-3) Total: 2 bytes
Signed-off-by: Ron Yorston <rmy@pobox.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'libbb')
-rw-r--r-- | libbb/print_numbered_lines.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libbb/print_numbered_lines.c b/libbb/print_numbered_lines.c index d6459d7c3..4758068a4 100644 --- a/libbb/print_numbered_lines.c +++ b/libbb/print_numbered_lines.c | |||
@@ -22,10 +22,11 @@ int FAST_FUNC print_numbered_lines(struct number_state *ns, const char *filename | |||
22 | if (ns->all | 22 | if (ns->all |
23 | || (ns->nonempty && line[0]) | 23 | || (ns->nonempty && line[0]) |
24 | ) { | 24 | ) { |
25 | printf("%*u%s%s\n", ns->width, N, ns->sep, line); | 25 | printf("%*u%s", ns->width, N, ns->sep); |
26 | N += ns->inc; | 26 | N += ns->inc; |
27 | } else if (ns->empty_str) | 27 | } else if (ns->empty_str) |
28 | fputs(ns->empty_str, stdout); | 28 | fputs(ns->empty_str, stdout); |
29 | puts(line); | ||
29 | free(line); | 30 | free(line); |
30 | } | 31 | } |
31 | ns->start = N; | 32 | ns->start = N; |