emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

head,tail: use common suffix struct. simplify help text.

Browse Source 
function                                             old     new   delta
head_tail_suffixes                                     -      32     +32
head_main                                            415     406      -9
packed_usage                                       29252   29234     -18
tail_suffixes                                         32       -     -32
head_suffixes                                         32       -     -32
------------------------------------------------------------------------------
(add/remove: 2/2 grow/shrink: 0/2 up/down: 32/-91)            Total: -59 bytes
   text    data     bss     dec     hex filename
 890474     497    7584  898555   db5fb busybox_old
 890415     497    7584  898496   db5c0 busybox_unstripped

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko
2013-02-25 01:24:32 +01:00
parent 8e6a1ea825
commit af0255f496
5 changed files with 40 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
coreutils/tail.c
View File

@ -24,6 +24,9 @@
* 7) lseek attempted when count==0 even if arg was +0 (from top)
*/
//kbuild:lib-$(CONFIG_TAIL) += tail.o
//kbuild:lib-$(CONFIG_TAIL) += head_tail.o
//usage:#define tail_trivial_usage
//usage: "[OPTIONS] [FILE]..."
//usage:#define tail_full_usage "\n\n"
@ -34,14 +37,13 @@
//usage: "\n -s SECONDS Wait SECONDS between reads with -f"
//usage: )
//usage: "\n -n N[kbm] Print last N lines"
//usage: "\n -n +N[kbm] Skip N lines and print the rest"
//usage: IF_FEATURE_FANCY_TAIL(
//usage: "\n -c N[kbm] Print last N bytes"
//usage: "\n -c [+]N[kbm] Print last N bytes"
//usage: "\n -q Never print headers"
//usage: "\n -v Always print headers"
//usage: "\n"
//usage: "\nN may be suffixed by k (x1024), b (x512), or m (x1024^2)."
//usage: "\nIf N starts with a '+', output begins with the Nth item from the start"
//usage: "\nof each file, not from the end."
//usage: )
//usage:
//usage:#define tail_example_usage
@ -49,13 +51,7 @@
//usage: "nameserver 10.0.0.1\n"
#include "libbb.h"
static const struct suffix_mult tail_suffixes[] = {
{ "b", 512 },
{ "k", 1024 },
{ "m", 1024*1024 },
{ "", 0 }
};
#include "head_tail.h"
struct globals {
bool from_top;
@ -102,7 +98,7 @@ static unsigned eat_num(const char *p)
p++;
G.from_top = 1;
}
return xatou_sfx(p, tail_suffixes);
return xatou_sfx(p, head_tail_suffixes);
}
int tail_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;