e6a2f4cc5a
The config item is FEATURE_USE_BSS_TAIL. When it is off (default): function old new delta read_config 210 228 +18 doCommands 2279 2294 +15 ipneigh_list_or_flush 763 772 +9 ipaddr_list_or_flush 1256 1261 +5 display_process_list 1301 1306 +5 conspy_main 1378 1383 +5 do_lzo_compress 352 355 +3 do_lzo_decompress 565 567 +2 push 46 44 -2 inetd_main 2136 2134 -2 uevent_main 421 418 -3 addLines 97 92 -5 bb_common_bufsiz1 8193 1024 -7169 ------------------------------------------------------------------------------ (add/remove: 0/0 grow/shrink: 8/5 up/down: 62/-7181) Total: -7119 bytes text data bss dec hex filename 829850 4086 9080 843016 cdd08 busybox_old 829901 4086 1904 835891 cc133 busybox_unstripped FEATURE_USE_BSS_TAIL=y: read_config 210 228 +18 doCommands 2279 2294 +15 ipneigh_list_or_flush 763 772 +9 ipaddr_list_or_flush 1256 1261 +5 display_process_list 1301 1306 +5 conspy_main 1378 1383 +5 do_lzo_compress 352 355 +3 do_lzo_decompress 565 567 +2 inetd_main 2136 2134 -2 bb_common_bufsiz1 8193 - -8193 ------------------------------------------------------------------------------ (add/remove: 0/1 grow/shrink: 8/1 up/down: 62/-8195) Total: -8133 bytes text data bss dec hex filename 829850 4086 9080 843016 cdd08 busybox_old 829911 4086 880 834877 cbd3d busybox_unstripped FIXME: setup_common_bufsiz() calls are missing. Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
84 lines
1.9 KiB
C
84 lines
1.9 KiB
C
/* vi: set sw=4 ts=4: */
|
|
/*
|
|
* cat -v implementation for busybox
|
|
*
|
|
* Copyright (C) 2006 Rob Landley <rob@landley.net>
|
|
*
|
|
* Licensed under GPLv2 or later, see file LICENSE in this source tree.
|
|
*/
|
|
|
|
/* See "Cat -v considered harmful" at
|
|
* http://cm.bell-labs.com/cm/cs/doc/84/kp.ps.gz */
|
|
|
|
//usage:#define catv_trivial_usage
|
|
//usage: "[-etv] [FILE]..."
|
|
//usage:#define catv_full_usage "\n\n"
|
|
//usage: "Display nonprinting characters as ^x or M-x\n"
|
|
//usage: "\n -e End each line with $"
|
|
//usage: "\n -t Show tabs as ^I"
|
|
//usage: "\n -v Don't use ^x or M-x escapes"
|
|
|
|
#include "libbb.h"
|
|
#include "common_bufsiz.h"
|
|
|
|
#define CATV_OPT_e (1<<0)
|
|
#define CATV_OPT_t (1<<1)
|
|
#define CATV_OPT_v (1<<2)
|
|
struct BUG_const_mismatch {
|
|
char BUG_const_mismatch[
|
|
CATV_OPT_e == VISIBLE_ENDLINE && CATV_OPT_t == VISIBLE_SHOW_TABS
|
|
? 1 : -1
|
|
];
|
|
};
|
|
|
|
int catv_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
|
|
int catv_main(int argc UNUSED_PARAM, char **argv)
|
|
{
|
|
int retval = EXIT_SUCCESS;
|
|
int fd;
|
|
unsigned opts;
|
|
opts = getopt32(argv, "etv");
|
|
argv += optind;
|
|
#if 0 /* These consts match, we can just pass "opts" to visible() */
|
|
if (opts & CATV_OPT_e)
|
|
flags |= VISIBLE_ENDLINE;
|
|
if (opts & CATV_OPT_t)
|
|
flags |= VISIBLE_SHOW_TABS;
|
|
#endif
|
|
|
|
/* Read from stdin if there's nothing else to do. */
|
|
if (!argv[0])
|
|
*--argv = (char*)"-";
|
|
do {
|
|
fd = open_or_warn_stdin(*argv);
|
|
if (fd < 0) {
|
|
retval = EXIT_FAILURE;
|
|
continue;
|
|
}
|
|
for (;;) {
|
|
int i, res;
|
|
|
|
#define read_buf bb_common_bufsiz1
|
|
res = read(fd, read_buf, COMMON_BUFSIZE);
|
|
if (res < 0)
|
|
retval = EXIT_FAILURE;
|
|
if (res <= 0)
|
|
break;
|
|
for (i = 0; i < res; i++) {
|
|
unsigned char c = read_buf[i];
|
|
if (opts & CATV_OPT_v) {
|
|
putchar(c);
|
|
} else {
|
|
char buf[sizeof("M-^c")];
|
|
visible(c, buf, opts);
|
|
fputs(buf, stdout);
|
|
}
|
|
}
|
|
}
|
|
if (ENABLE_FEATURE_CLEAN_UP && fd)
|
|
close(fd);
|
|
} while (*++argv);
|
|
|
|
fflush_stdout_and_exit(retval);
|
|
}
|