cad3fc743a
function old new delta fputs_stdout - 12 +12 zxc_vm_process 7237 7230 -7 yes_main 85 78 -7 write_block 380 373 -7 wrapf 305 298 -7 strings_main 437 430 -7 show_bridge 353 346 -7 rev_main 384 377 -7 put_prompt_custom 58 51 -7 put_cur_glyph_and_inc_cursor 168 161 -7 print_numbered_lines 152 145 -7 print_named_ascii 130 123 -7 print_name 135 128 -7 print_login_issue 386 379 -7 print_ascii 208 201 -7 powertop_main 1249 1242 -7 od_main 1789 1782 -7 logread_main 518 511 -7 head_main 804 797 -7 display_process_list 1319 1312 -7 cut_main 1002 995 -7 bb_dump_dump 1550 1543 -7 bb_ask_noecho 393 386 -7 baseNUM_main 702 695 -7 expand_main 755 745 -10 dumpleases_main 497 487 -10 write1 12 - -12 putcsi 37 23 -14 print_login_prompt 55 41 -14 paste_main 525 511 -14 cat_main 440 426 -14 print_it 245 230 -15 print_addrinfo 1188 1171 -17 print_rule 770 750 -20 print_linkinfo 842 822 -20 httpd_main 791 771 -20 ------------------------------------------------------------------------------ (add/remove: 1/1 grow/shrink: 0/34 up/down: 12/-341) Total: -329 bytes Signed-off-by: Ron Yorston <rmy@pobox.com> Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
254 lines
6.2 KiB
C
254 lines
6.2 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.1 kb)"
|
|
//config: default y
|
|
//config: help
|
|
//config: By default, convert all tabs to spaces.
|
|
//config:
|
|
//config:config UNEXPAND
|
|
//config: bool "unexpand (5.3 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,
|
|
};
|
|
|
|
//FIXME: does not work properly with input containing NULs
|
|
//coreutils 8.30 preserves NULs but treats them as chars of width zero:
|
|
//AB<nul><tab>C will expand <tab> to 6 spaces, not 5.
|
|
|
|
#if ENABLE_EXPAND
|
|
static void expand(FILE *file, unsigned tab_size, unsigned opt)
|
|
{
|
|
|
|
for (;;) {
|
|
char *line;
|
|
char *ptr;
|
|
char *ptr_strbeg;
|
|
//commented-out code handles NULs, +90 bytes of code, not tested much
|
|
// size_t linelen;
|
|
// unsigned len = 0;
|
|
|
|
// linelen = 1024 * 1024;
|
|
// line = xmalloc_fgets_str_len(file, "\n", &linelen);
|
|
line = xmalloc_fgets(file); //
|
|
if (!line)
|
|
break;
|
|
ptr = ptr_strbeg = line;
|
|
for (;;) {
|
|
unsigned char c = *ptr;
|
|
if (c == '\0') {
|
|
// size_t rem = line + linelen - ptr;
|
|
// if (rem > 0) {
|
|
//# if ENABLE_UNICODE_SUPPORT
|
|
// len += unicode_strwidth(ptr_strbeg);
|
|
//# else
|
|
// len += ptr - ptr_strbeg;
|
|
//# endif
|
|
// printf("%s%c", ptr_strbeg, '\0');
|
|
// memmove(ptr, ptr + 1, rem + 1);
|
|
// ptr_strbeg = ptr;
|
|
// linelen--;
|
|
// continue;
|
|
// }
|
|
break;
|
|
}
|
|
if ((opt & OPT_INITIAL) && !isblank(c)) {
|
|
/* not space or tab */
|
|
break;
|
|
}
|
|
if (c == '\t') {
|
|
unsigned len = 0; //
|
|
*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, "");
|
|
// len = 0;
|
|
ptr_strbeg = ptr + 1;
|
|
}
|
|
ptr++;
|
|
}
|
|
fputs_stdout(ptr_strbeg);
|
|
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_ALL) && 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 "f"
|
|
"tabs\0" Required_argument "t"
|
|
"all\0" No_argument "a"
|
|
, &opt_t
|
|
);
|
|
/* -t implies -a, but an explicit -f overrides */
|
|
if (opt & OPT_INITIAL) opt &= ~OPT_ALL;
|
|
}
|
|
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_simple_perror_msg_and_die(bb_msg_standard_input);
|
|
|
|
fflush_stdout_and_exit(exit_status);
|
|
}
|