22542eca18
function old new delta vgetopt32 1318 1392 +74 runsvdir_main 703 713 +10 bb_make_directory 423 425 +2 collect_cpu 546 545 -1 opt_chars 3 - -3 opt_complementary 4 - -4 tftpd_main 567 562 -5 ntp_init 476 471 -5 zcip_main 1266 1256 -10 xxd_main 428 418 -10 whois_main 140 130 -10 who_main 463 453 -10 which_main 212 202 -10 wget_main 2535 2525 -10 watchdog_main 291 281 -10 watch_main 222 212 -10 vlock_main 399 389 -10 uuencode_main 332 322 -10 uudecode_main 316 306 -10 unlink_main 45 35 -10 udhcpd_main 1482 1472 -10 udhcpc_main 2762 2752 -10 tune2fs_main 290 280 -10 tunctl_main 366 356 -10 truncate_main 218 208 -10 tr_main 518 508 -10 time_main 1134 1124 -10 tftp_main 286 276 -10 telnetd_main 1873 1863 -10 tcpudpsvd_main 1785 1775 -10 taskset_main 521 511 -10 tar_main 1009 999 -10 tail_main 1644 1634 -10 syslogd_main 1967 1957 -10 switch_root_main 368 358 -10 svlogd_main 1454 1444 -10 sv 1296 1286 -10 stat_main 104 94 -10 start_stop_daemon_main 1028 1018 -10 split_main 542 532 -10 sort_main 796 786 -10 slattach_main 624 614 -10 shuf_main 504 494 -10 setsid_main 96 86 -10 setserial_main 1132 1122 -10 setfont_main 388 378 -10 setconsole_main 78 68 -10 sendmail_main 1209 1199 -10 sed_main 677 667 -10 script_main 1077 1067 -10 run_parts_main 325 315 -10 rtcwake_main 454 444 -10 rm_main 175 165 -10 reformime_main 119 109 -10 readlink_main 123 113 -10 rdate_main 246 236 -10 pwdx_main 189 179 -10 pstree_main 317 307 -10 pscan_main 663 653 -10 popmaildir_main 818 808 -10 pmap_main 80 70 -10 nc_main 1042 1032 -10 mv_main 558 548 -10 mountpoint_main 477 467 -10 mount_main 1264 1254 -10 modprobe_main 768 758 -10 modinfo_main 333 323 -10 mktemp_main 200 190 -10 mkswap_main 324 314 -10 mkfs_vfat_main 1489 1479 -10 microcom_main 715 705 -10 md5_sha1_sum_main 521 511 -10 man_main 867 857 -10 makedevs_main 1052 1042 -10 ls_main 563 553 -10 losetup_main 432 422 -10 loadfont_main 89 79 -10 ln_main 524 514 -10 link_main 75 65 -10 ipcalc_main 544 534 -10 iostat_main 2397 2387 -10 install_main 768 758 -10 id_main 480 470 -10 i2cset_main 1239 1229 -10 i2cget_main 380 370 -10 i2cdump_main 1482 1472 -10 i2cdetect_main 682 672 -10 hwclock_main 406 396 -10 httpd_main 741 731 -10 grep_main 837 827 -10 getty_main 1559 1549 -10 fuser_main 297 287 -10 ftpgetput_main 345 335 -10 ftpd_main 2232 2222 -10 fstrim_main 251 241 -10 fsfreeze_main 77 67 -10 fsck_minix_main 2921 2911 -10 flock_main 314 304 -10 flashcp_main 740 730 -10 flash_eraseall_main 833 823 -10 fdformat_main 532 522 -10 expand_main 680 670 -10 eject_main 335 325 -10 dumpleases_main 630 620 -10 du_main 314 304 -10 dos2unix_main 441 431 -10 diff_main 1350 1340 -10 df_main 1064 1054 -10 date_main 1095 1085 -10 cut_main 961 951 -10 cryptpw_main 228 218 -10 crontab_main 575 565 -10 crond_main 1149 1139 -10 cp_main 370 360 -10 common_traceroute_main 3834 3824 -10 common_ping_main 1767 1757 -10 comm_main 239 229 -10 cmp_main 655 645 -10 chrt_main 379 369 -10 chpst_main 704 694 -10 chpasswd_main 308 298 -10 chown_main 171 161 -10 chmod_main 158 148 -10 cat_main 428 418 -10 bzip2_main 120 110 -10 blkdiscard_main 264 254 -10 base64_main 221 211 -10 arping_main 1665 1655 -10 ar_main 556 546 -10 adjtimex_main 406 396 -10 adduser_main 882 872 -10 addgroup_main 411 401 -10 acpid_main 1198 1188 -10 optstring 11 - -11 opt_string 18 - -18 OPT_STR 25 - -25 ubi_tools_main 1288 1258 -30 ls_options 31 - -31 ------------------------------------------------------------------------------ (add/remove: 0/6 grow/shrink: 3/129 up/down: 86/-1383) Total: -1297 bytes text data bss dec hex filename 915428 485 6876 922789 e14a5 busybox_old 914629 485 6872 921986 e1182 busybox_unstripped Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
213 lines
6.0 KiB
C
213 lines
6.0 KiB
C
/* vi: set sw=4 ts=4: */
|
|
/*
|
|
* cat implementation for busybox
|
|
*
|
|
* Copyright (C) 2003 Manuel Novoa III <mjn3@codepoet.org>
|
|
*
|
|
* Licensed under GPLv2, see file LICENSE in this source tree.
|
|
*/
|
|
//config:config CAT
|
|
//config: bool "cat (5.6 kb)"
|
|
//config: default y
|
|
//config: help
|
|
//config: cat is used to concatenate files and print them to the standard
|
|
//config: output. Enable this option if you wish to enable the 'cat' utility.
|
|
//config:
|
|
//config:config FEATURE_CATN
|
|
//config: bool "Enable -n and -b options"
|
|
//config: default y
|
|
//config: depends on CAT
|
|
//config: help
|
|
//config: -n numbers all output lines while -b numbers nonempty output lines.
|
|
//config:
|
|
//config:config FEATURE_CATV
|
|
//config: bool "cat -v[etA]"
|
|
//config: default y
|
|
//config: depends on CAT
|
|
//config: help
|
|
//config: Display nonprinting characters as escape sequences
|
|
|
|
//applet:IF_CAT(APPLET(cat, BB_DIR_BIN, BB_SUID_DROP))
|
|
|
|
//kbuild:lib-$(CONFIG_CAT) += cat.o
|
|
|
|
/* BB_AUDIT SUSv3 compliant */
|
|
/* http://www.opengroup.org/onlinepubs/007904975/utilities/cat.html */
|
|
|
|
//usage:#if ENABLE_FEATURE_CATN || ENABLE_FEATURE_CATV
|
|
//usage:#define cat_trivial_usage
|
|
//usage: "[-" IF_FEATURE_CATN("nb") IF_FEATURE_CATV("vteA") "] [FILE]..."
|
|
//usage:#else
|
|
//usage:#define cat_trivial_usage
|
|
//usage: "[FILE]..."
|
|
//usage:#endif
|
|
//usage:#define cat_full_usage "\n\n"
|
|
//usage: "Print FILEs to stdout\n"
|
|
//usage: IF_FEATURE_CATN(
|
|
//usage: "\n -n Number output lines"
|
|
//usage: "\n -b Number nonempty lines"
|
|
//usage: )
|
|
//usage: IF_FEATURE_CATV(
|
|
//usage: "\n -v Show nonprinting characters as ^x or M-x"
|
|
//usage: "\n -t ...and tabs as ^I"
|
|
//usage: "\n -e ...and end lines with $"
|
|
//usage: "\n -A Same as -vte"
|
|
//usage: )
|
|
/*
|
|
Longopts not implemented yet:
|
|
--number-nonblank number nonempty output lines, overrides -n
|
|
--number number all output lines
|
|
--show-nonprinting use ^ and M- notation, except for LFD and TAB
|
|
--show-all equivalent to -vet
|
|
Not implemented yet:
|
|
-E, --show-ends display $ at end of each line (-e sans -v)
|
|
-T, --show-tabs display TAB characters as ^I (-t sans -v)
|
|
-s, --squeeze-blank suppress repeated empty output lines
|
|
*/
|
|
//usage:
|
|
//usage:#define cat_example_usage
|
|
//usage: "$ cat /proc/uptime\n"
|
|
//usage: "110716.72 17.67"
|
|
|
|
#include "libbb.h"
|
|
#include "common_bufsiz.h"
|
|
|
|
#if ENABLE_FEATURE_CATV
|
|
/*
|
|
* 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.
|
|
*/
|
|
/* Rob had "cat -v" implemented as a separate applet, catv.
|
|
* See "cat -v considered harmful" at
|
|
* http://cm.bell-labs.com/cm/cs/doc/84/kp.ps.gz
|
|
* From USENIX Summer Conference Proceedings, 1983
|
|
* """
|
|
* The talk reviews reasons for UNIX's popularity and shows, using UCB cat
|
|
* as a primary example, how UNIX has grown fat. cat isn't for printing
|
|
* files with line numbers, it isn't for compressing multiple blank lines,
|
|
* it's not for looking at non-printing ASCII characters, it's for
|
|
* concatenating files.
|
|
* We are reminded that ls isn't the place for code to break a single column
|
|
* into multiple ones, and that mailnews shouldn't have its own more
|
|
* processing or joke encryption code.
|
|
* """
|
|
*
|
|
* I agree with the argument. Unfortunately, this ship has sailed (1983...).
|
|
* There are dozens of Linux distros and each of them has "cat" which supports -v.
|
|
* It's unrealistic for us to "reeducate" them to use our, incompatible way
|
|
* to achieve "cat -v" effect. The actual effect would be "users pissed off
|
|
* by gratuitous incompatibility".
|
|
*/
|
|
#define CAT_OPT_e (1<<0)
|
|
#define CAT_OPT_t (1<<1)
|
|
#define CAT_OPT_v (1<<2)
|
|
/* -A occupies bit (1<<3) */
|
|
#define CAT_OPT_n ((1<<4) * ENABLE_FEATURE_CATN)
|
|
#define CAT_OPT_b ((1<<5) * ENABLE_FEATURE_CATN)
|
|
static int catv(unsigned opts, char **argv)
|
|
{
|
|
int retval = EXIT_SUCCESS;
|
|
int fd;
|
|
#if ENABLE_FEATURE_CATN
|
|
unsigned lineno = 0;
|
|
unsigned eol_char = (opts & (CAT_OPT_n|CAT_OPT_b)) ? '\n' : 0x100;
|
|
unsigned skip_num_on = (opts & CAT_OPT_b) ? '\n' : 0x100;
|
|
bool eol_seen = 1;
|
|
#endif
|
|
|
|
BUILD_BUG_ON(CAT_OPT_e != VISIBLE_ENDLINE);
|
|
BUILD_BUG_ON(CAT_OPT_t != VISIBLE_SHOW_TABS);
|
|
#if 0 /* These consts match, we can just pass "opts" to visible() */
|
|
if (opts & CAT_OPT_e)
|
|
flags |= VISIBLE_ENDLINE;
|
|
if (opts & CAT_OPT_t)
|
|
flags |= VISIBLE_SHOW_TABS;
|
|
#endif
|
|
|
|
#define read_buf bb_common_bufsiz1
|
|
setup_common_bufsiz();
|
|
do {
|
|
fd = open_or_warn_stdin(*argv);
|
|
if (fd < 0) {
|
|
retval = EXIT_FAILURE;
|
|
continue;
|
|
}
|
|
for (;;) {
|
|
int i, res;
|
|
|
|
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];
|
|
char buf[sizeof("M-^c")];
|
|
#if ENABLE_FEATURE_CATN
|
|
if (eol_seen && c != skip_num_on)
|
|
printf("%6u ", ++lineno);
|
|
eol_seen = (c == eol_char);
|
|
#endif
|
|
visible(c, buf, opts);
|
|
fputs(buf, stdout);
|
|
}
|
|
}
|
|
if (ENABLE_FEATURE_CLEAN_UP && fd)
|
|
close(fd);
|
|
} while (*++argv);
|
|
|
|
fflush_stdout_and_exit(retval);
|
|
}
|
|
#undef CAT_OPT_n
|
|
#undef CAT_OPT_b
|
|
#endif
|
|
|
|
int cat_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
|
|
int cat_main(int argc UNUSED_PARAM, char **argv)
|
|
{
|
|
unsigned opts;
|
|
|
|
opts = getopt32(argv, IF_FEATURE_CATV("^")
|
|
/* -u is ignored ("unbuffered") */
|
|
IF_FEATURE_CATV("etvA")IF_FEATURE_CATN("nb")"u"
|
|
IF_FEATURE_CATV("\0" "Aetv" /* -A == -vet */)
|
|
);
|
|
argv += optind;
|
|
|
|
/* Read from stdin if there's nothing else to do. */
|
|
if (!argv[0])
|
|
*--argv = (char*)"-";
|
|
|
|
#if ENABLE_FEATURE_CATV
|
|
if (opts & 7)
|
|
return catv(opts, argv);
|
|
opts >>= 4;
|
|
#endif
|
|
|
|
#if ENABLE_FEATURE_CATN
|
|
# define CAT_OPT_n (1<<0)
|
|
# define CAT_OPT_b (1<<1)
|
|
if (opts & (CAT_OPT_n|CAT_OPT_b)) { /* -n or -b */
|
|
struct number_state ns;
|
|
|
|
ns.width = 6;
|
|
ns.start = 1;
|
|
ns.inc = 1;
|
|
ns.sep = "\t";
|
|
ns.empty_str = "\n";
|
|
ns.all = !(opts & CAT_OPT_b); /* -n without -b */
|
|
ns.nonempty = (opts & CAT_OPT_b); /* -b (with or without -n) */
|
|
do {
|
|
print_numbered_lines(&ns, *argv);
|
|
} while (*++argv);
|
|
fflush_stdout_and_exit(EXIT_SUCCESS);
|
|
}
|
|
/*opts >>= 2;*/
|
|
#endif
|
|
|
|
return bb_cat(argv);
|
|
}
|