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>
225 lines
5.5 KiB
C
225 lines
5.5 KiB
C
/* expand - convert tabs to spaces
|
|
* unexpand - convert spaces to tabs
|
|
*
|
|
* Copyright (C) 89, 91, 1995-2006 Free Software Foundation, Inc.
|
|
*
|
|
* Licensed under GPLv2 or later, see file LICENSE in this source tree.
|
|
*
|
|
* David MacKenzie <djm@gnu.ai.mit.edu>
|
|
*
|
|
* Options for expand:
|
|
* -t num --tabs NUM Convert tabs to num spaces (default 8 spaces).
|
|
* -i --initial Only convert initial tabs on each line to spaces.
|
|
*
|
|
* Options for unexpand:
|
|
* -a --all Convert all blanks, instead of just initial blanks.
|
|
* -f --first-only Convert only leading sequences of blanks (default).
|
|
* -t num --tabs NUM Have tabs num characters apart instead of 8.
|
|
*
|
|
* Busybox version (C) 2007 by Tito Ragusa <farmatito@tiscali.it>
|
|
*
|
|
* Caveat: this versions of expand and unexpand don't accept tab lists.
|
|
*/
|
|
//config:config EXPAND
|
|
//config: bool "expand (5.8 kb)"
|
|
//config: default y
|
|
//config: help
|
|
//config: By default, convert all tabs to spaces.
|
|
//config:
|
|
//config:config UNEXPAND
|
|
//config: bool "unexpand (6 kb)"
|
|
//config: default y
|
|
//config: help
|
|
//config: By default, convert only leading sequences of blanks to tabs.
|
|
|
|
//applet:IF_EXPAND(APPLET(expand, BB_DIR_USR_BIN, BB_SUID_DROP))
|
|
// APPLET_ODDNAME:name main location suid_type help
|
|
//applet:IF_UNEXPAND(APPLET_ODDNAME(unexpand, expand, BB_DIR_USR_BIN, BB_SUID_DROP, unexpand))
|
|
|
|
//kbuild:lib-$(CONFIG_EXPAND) += expand.o
|
|
//kbuild:lib-$(CONFIG_UNEXPAND) += expand.o
|
|
|
|
//usage:#define expand_trivial_usage
|
|
//usage: "[-i] [-t N] [FILE]..."
|
|
//usage:#define expand_full_usage "\n\n"
|
|
//usage: "Convert tabs to spaces, writing to stdout\n"
|
|
//usage: "\n -i Don't convert tabs after non blanks"
|
|
//usage: "\n -t Tabstops every N chars"
|
|
|
|
//usage:#define unexpand_trivial_usage
|
|
//usage: "[-fa][-t N] [FILE]..."
|
|
//usage:#define unexpand_full_usage "\n\n"
|
|
//usage: "Convert spaces to tabs, writing to stdout\n"
|
|
//usage: "\n -a Convert all blanks"
|
|
//usage: "\n -f Convert only leading blanks"
|
|
//usage: "\n -t N Tabstops every N chars"
|
|
|
|
#include "libbb.h"
|
|
#include "unicode.h"
|
|
|
|
enum {
|
|
OPT_INITIAL = 1 << 0,
|
|
OPT_TABS = 1 << 1,
|
|
OPT_ALL = 1 << 2,
|
|
};
|
|
|
|
#if ENABLE_EXPAND
|
|
static void expand(FILE *file, unsigned tab_size, unsigned opt)
|
|
{
|
|
char *line;
|
|
|
|
while ((line = xmalloc_fgets(file)) != NULL) {
|
|
unsigned char c;
|
|
char *ptr;
|
|
char *ptr_strbeg;
|
|
|
|
ptr = ptr_strbeg = line;
|
|
while ((c = *ptr) != '\0') {
|
|
if ((opt & OPT_INITIAL) && !isblank(c)) {
|
|
/* not space or tab */
|
|
break;
|
|
}
|
|
if (c == '\t') {
|
|
unsigned len;
|
|
*ptr = '\0';
|
|
# if ENABLE_UNICODE_SUPPORT
|
|
len = unicode_strwidth(ptr_strbeg);
|
|
# else
|
|
len = ptr - ptr_strbeg;
|
|
# endif
|
|
len = tab_size - (len % tab_size);
|
|
/*while (ptr[1] == '\t') { ptr++; len += tab_size; } - can handle many tabs at once */
|
|
printf("%s%*s", ptr_strbeg, len, "");
|
|
ptr_strbeg = ptr + 1;
|
|
}
|
|
ptr++;
|
|
}
|
|
fputs(ptr_strbeg, stdout);
|
|
free(line);
|
|
}
|
|
}
|
|
#endif
|
|
|
|
#if ENABLE_UNEXPAND
|
|
static void unexpand(FILE *file, unsigned tab_size, unsigned opt)
|
|
{
|
|
char *line;
|
|
|
|
while ((line = xmalloc_fgets(file)) != NULL) {
|
|
char *ptr = line;
|
|
unsigned column = 0;
|
|
|
|
while (*ptr) {
|
|
unsigned n;
|
|
unsigned len = 0;
|
|
|
|
while (*ptr == ' ') {
|
|
ptr++;
|
|
len++;
|
|
}
|
|
column += len;
|
|
if (*ptr == '\t') {
|
|
column += tab_size - (column % tab_size);
|
|
ptr++;
|
|
continue;
|
|
}
|
|
|
|
n = column / tab_size;
|
|
if (n) {
|
|
len = column = column % tab_size;
|
|
while (n--)
|
|
putchar('\t');
|
|
}
|
|
|
|
if ((opt & OPT_INITIAL) && ptr != line) {
|
|
printf("%*s%s", len, "", ptr);
|
|
break;
|
|
}
|
|
n = strcspn(ptr, "\t ");
|
|
printf("%*s%.*s", len, "", n, ptr);
|
|
# if ENABLE_UNICODE_SUPPORT
|
|
{
|
|
char c = ptr[n];
|
|
ptr[n] = '\0';
|
|
len = unicode_strwidth(ptr);
|
|
ptr[n] = c;
|
|
}
|
|
# else
|
|
len = n;
|
|
# endif
|
|
ptr += n;
|
|
column = (column + len) % tab_size;
|
|
}
|
|
free(line);
|
|
}
|
|
}
|
|
#endif
|
|
|
|
int expand_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
|
|
int expand_main(int argc UNUSED_PARAM, char **argv)
|
|
{
|
|
/* Default 8 spaces for 1 tab */
|
|
const char *opt_t = "8";
|
|
FILE *file;
|
|
unsigned tab_size;
|
|
unsigned opt;
|
|
int exit_status = EXIT_SUCCESS;
|
|
|
|
init_unicode();
|
|
|
|
if (ENABLE_EXPAND && (!ENABLE_UNEXPAND || applet_name[0] == 'e')) {
|
|
opt = getopt32long(argv, "it:",
|
|
"initial\0" No_argument "i"
|
|
"tabs\0" Required_argument "t"
|
|
, &opt_t
|
|
);
|
|
} else {
|
|
opt = getopt32long(argv, "^"
|
|
"ft:a"
|
|
"\0"
|
|
"ta" /* -t NUM sets -a */,
|
|
"first-only\0" No_argument "i"
|
|
"tabs\0" Required_argument "t"
|
|
"all\0" No_argument "a"
|
|
, &opt_t
|
|
);
|
|
/* -f --first-only is the default */
|
|
if (!(opt & OPT_ALL)) opt |= OPT_INITIAL;
|
|
}
|
|
tab_size = xatou_range(opt_t, 1, UINT_MAX);
|
|
|
|
argv += optind;
|
|
|
|
if (!*argv) {
|
|
*--argv = (char*)bb_msg_standard_input;
|
|
}
|
|
do {
|
|
file = fopen_or_warn_stdin(*argv);
|
|
if (!file) {
|
|
exit_status = EXIT_FAILURE;
|
|
continue;
|
|
}
|
|
|
|
if (ENABLE_EXPAND && (!ENABLE_UNEXPAND || applet_name[0] == 'e'))
|
|
IF_EXPAND(expand(file, tab_size, opt));
|
|
else
|
|
IF_UNEXPAND(unexpand(file, tab_size, opt));
|
|
|
|
/* Check and close the file */
|
|
if (fclose_if_not_stdin(file)) {
|
|
bb_simple_perror_msg(*argv);
|
|
exit_status = EXIT_FAILURE;
|
|
}
|
|
/* If stdin also clear EOF */
|
|
if (file == stdin)
|
|
clearerr(file);
|
|
} while (*++argv);
|
|
|
|
/* Now close stdin also */
|
|
/* (if we didn't read from it, it's a no-op) */
|
|
if (fclose(stdin))
|
|
bb_perror_msg_and_die(bb_msg_standard_input);
|
|
|
|
fflush_stdout_and_exit(exit_status);
|
|
}
|