2007-08-13 19:40:24 +05:30
|
|
|
/* expand - convert tabs to spaces
|
|
|
|
* unexpand - convert spaces to tabs
|
|
|
|
*
|
|
|
|
* Copyright (C) 89, 91, 1995-2006 Free Software Foundation, Inc.
|
|
|
|
*
|
2010-08-16 23:44:46 +05:30
|
|
|
* Licensed under GPLv2 or later, see file LICENSE in this source tree.
|
2007-08-13 19:40:24 +05:30
|
|
|
*
|
|
|
|
* David MacKenzie <djm@gnu.ai.mit.edu>
|
|
|
|
*
|
|
|
|
* Options for expand:
|
2017-01-21 07:19:58 +05:30
|
|
|
* -t num --tabs NUM Convert tabs to num spaces (default 8 spaces).
|
2007-08-13 19:40:24 +05:30
|
|
|
* -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).
|
2017-01-21 07:19:58 +05:30
|
|
|
* -t num --tabs NUM Have tabs num characters apart instead of 8.
|
2007-08-13 19:40:24 +05:30
|
|
|
*
|
|
|
|
* Busybox version (C) 2007 by Tito Ragusa <farmatito@tiscali.it>
|
|
|
|
*
|
|
|
|
* Caveat: this versions of expand and unexpand don't accept tab lists.
|
|
|
|
*/
|
2016-11-23 19:16:56 +05:30
|
|
|
//config:config EXPAND
|
2017-07-19 01:31:24 +05:30
|
|
|
//config: bool "expand (5.8 kb)"
|
2016-11-23 19:16:56 +05:30
|
|
|
//config: default y
|
|
|
|
//config: help
|
2017-07-21 13:20:55 +05:30
|
|
|
//config: By default, convert all tabs to spaces.
|
2016-11-23 19:16:56 +05:30
|
|
|
//config:
|
|
|
|
//config:config UNEXPAND
|
2017-07-19 01:31:24 +05:30
|
|
|
//config: bool "unexpand (6 kb)"
|
2016-11-23 19:16:56 +05:30
|
|
|
//config: default y
|
|
|
|
//config: help
|
2017-07-21 13:20:55 +05:30
|
|
|
//config: By default, convert only leading sequences of blanks to tabs.
|
2016-11-23 19:16:56 +05:30
|
|
|
|
|
|
|
//applet:IF_EXPAND(APPLET(expand, BB_DIR_USR_BIN, BB_SUID_DROP))
|
2017-01-29 19:27:33 +05:30
|
|
|
// APPLET_ODDNAME:name main location suid_type help
|
2016-11-23 19:16:56 +05:30
|
|
|
//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
|
2011-03-31 18:13:25 +05:30
|
|
|
|
|
|
|
//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"
|
|
|
|
|
2007-08-13 19:40:24 +05:30
|
|
|
#include "libbb.h"
|
2010-01-04 20:51:31 +05:30
|
|
|
#include "unicode.h"
|
2007-08-13 19:40:24 +05:30
|
|
|
|
|
|
|
enum {
|
|
|
|
OPT_INITIAL = 1 << 0,
|
|
|
|
OPT_TABS = 1 << 1,
|
|
|
|
OPT_ALL = 1 << 2,
|
|
|
|
};
|
|
|
|
|
|
|
|
#if ENABLE_EXPAND
|
2010-01-04 20:51:31 +05:30
|
|
|
static void expand(FILE *file, unsigned tab_size, unsigned opt)
|
2007-08-13 19:40:24 +05:30
|
|
|
{
|
|
|
|
char *line;
|
|
|
|
|
|
|
|
while ((line = xmalloc_fgets(file)) != NULL) {
|
2008-12-14 21:15:25 +05:30
|
|
|
unsigned char c;
|
2010-01-04 20:51:31 +05:30
|
|
|
char *ptr;
|
|
|
|
char *ptr_strbeg;
|
2008-12-14 21:15:25 +05:30
|
|
|
|
2010-01-04 20:51:31 +05:30
|
|
|
ptr = ptr_strbeg = line;
|
2008-12-14 21:15:25 +05:30
|
|
|
while ((c = *ptr) != '\0') {
|
|
|
|
if ((opt & OPT_INITIAL) && !isblank(c)) {
|
2010-01-04 20:51:31 +05:30
|
|
|
/* not space or tab */
|
2008-12-14 21:15:25 +05:30
|
|
|
break;
|
2007-08-13 19:40:24 +05:30
|
|
|
}
|
2008-12-14 21:15:25 +05:30
|
|
|
if (c == '\t') {
|
2010-01-04 20:51:31 +05:30
|
|
|
unsigned len;
|
|
|
|
*ptr = '\0';
|
2010-03-26 18:36:56 +05:30
|
|
|
# if ENABLE_UNICODE_SUPPORT
|
2013-12-09 17:39:35 +05:30
|
|
|
len = unicode_strwidth(ptr_strbeg);
|
2010-01-04 20:51:31 +05:30
|
|
|
# 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;
|
2007-08-13 19:40:24 +05:30
|
|
|
}
|
2010-01-04 20:51:31 +05:30
|
|
|
ptr++;
|
2007-08-13 19:40:24 +05:30
|
|
|
}
|
2010-01-04 20:51:31 +05:30
|
|
|
fputs(ptr_strbeg, stdout);
|
2008-12-14 21:15:25 +05:30
|
|
|
free(line);
|
2007-08-13 19:40:24 +05:30
|
|
|
}
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#if ENABLE_UNEXPAND
|
2008-12-14 21:15:25 +05:30
|
|
|
static void unexpand(FILE *file, unsigned tab_size, unsigned opt)
|
2007-08-13 19:40:24 +05:30
|
|
|
{
|
|
|
|
char *line;
|
|
|
|
|
|
|
|
while ((line = xmalloc_fgets(file)) != NULL) {
|
2008-12-26 20:26:03 +05:30
|
|
|
char *ptr = line;
|
|
|
|
unsigned column = 0;
|
|
|
|
|
|
|
|
while (*ptr) {
|
|
|
|
unsigned n;
|
2010-03-26 14:16:07 +05:30
|
|
|
unsigned len = 0;
|
2008-12-26 20:26:03 +05:30
|
|
|
|
|
|
|
while (*ptr == ' ') {
|
|
|
|
ptr++;
|
2010-03-26 14:16:07 +05:30
|
|
|
len++;
|
2008-12-26 20:26:03 +05:30
|
|
|
}
|
2010-03-26 14:16:07 +05:30
|
|
|
column += len;
|
2008-12-26 20:26:03 +05:30
|
|
|
if (*ptr == '\t') {
|
|
|
|
column += tab_size - (column % tab_size);
|
|
|
|
ptr++;
|
|
|
|
continue;
|
2007-08-13 19:40:24 +05:30
|
|
|
}
|
2008-12-26 20:26:03 +05:30
|
|
|
|
|
|
|
n = column / tab_size;
|
2010-03-26 14:16:07 +05:30
|
|
|
if (n) {
|
|
|
|
len = column = column % tab_size;
|
|
|
|
while (n--)
|
|
|
|
putchar('\t');
|
|
|
|
}
|
2008-12-26 20:26:03 +05:30
|
|
|
|
|
|
|
if ((opt & OPT_INITIAL) && ptr != line) {
|
2010-03-26 14:16:07 +05:30
|
|
|
printf("%*s%s", len, "", ptr);
|
2008-12-26 20:26:03 +05:30
|
|
|
break;
|
2007-08-13 19:40:24 +05:30
|
|
|
}
|
2008-12-26 20:26:03 +05:30
|
|
|
n = strcspn(ptr, "\t ");
|
2010-03-26 14:16:07 +05:30
|
|
|
printf("%*s%.*s", len, "", n, ptr);
|
2010-03-26 18:36:56 +05:30
|
|
|
# if ENABLE_UNICODE_SUPPORT
|
2010-01-04 20:51:31 +05:30
|
|
|
{
|
2013-12-09 17:39:35 +05:30
|
|
|
char c = ptr[n];
|
2010-01-04 20:51:31 +05:30
|
|
|
ptr[n] = '\0';
|
2013-12-09 17:39:35 +05:30
|
|
|
len = unicode_strwidth(ptr);
|
2010-01-04 20:51:31 +05:30
|
|
|
ptr[n] = c;
|
|
|
|
}
|
|
|
|
# else
|
|
|
|
len = n;
|
|
|
|
# endif
|
2008-12-26 20:26:03 +05:30
|
|
|
ptr += n;
|
2010-01-04 20:51:31 +05:30
|
|
|
column = (column + len) % tab_size;
|
2007-08-13 19:40:24 +05:30
|
|
|
}
|
2008-12-26 20:26:03 +05:30
|
|
|
free(line);
|
2007-08-13 19:40:24 +05:30
|
|
|
}
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2007-10-11 15:35:36 +05:30
|
|
|
int expand_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
|
2008-07-05 14:48:54 +05:30
|
|
|
int expand_main(int argc UNUSED_PARAM, char **argv)
|
2007-08-13 19:40:24 +05:30
|
|
|
{
|
|
|
|
/* Default 8 spaces for 1 tab */
|
|
|
|
const char *opt_t = "8";
|
|
|
|
FILE *file;
|
|
|
|
unsigned tab_size;
|
|
|
|
unsigned opt;
|
|
|
|
int exit_status = EXIT_SUCCESS;
|
|
|
|
|
2010-01-05 01:19:58 +05:30
|
|
|
init_unicode();
|
2007-08-13 19:40:24 +05:30
|
|
|
|
|
|
|
if (ENABLE_EXPAND && (!ENABLE_UNEXPAND || applet_name[0] == 'e')) {
|
getopt32: remove applet_long_options
FEATURE_GETOPT_LONG made dependent on LONG_OPTS.
The folloving options are removed, now LONG_OPTS enables long options
for affected applets:
FEATURE_ENV_LONG_OPTIONS FEATURE_EXPAND_LONG_OPTIONS
FEATURE_UNEXPAND_LONG_OPTIONS FEATURE_MKDIR_LONG_OPTIONS
FEATURE_MV_LONG_OPTIONS FEATURE_RMDIR_LONG_OPTIONS
FEATURE_ADDGROUP_LONG_OPTIONS FEATURE_ADDUSER_LONG_OPTIONS
FEATURE_HWCLOCK_LONG_OPTIONS FEATURE_NSENTER_LONG_OPTS
FEATURE_CHCON_LONG_OPTIONS FEATURE_RUNCON_LONG_OPTIONS
They either had a small number of long options, or their long options are
essential.
Example: upstream addgroup and adduser have ONLY longopts,
we should probably go further and get rid
of non-standard short options.
To this end, make addgroup and adduser "select LONG_OPTS".
We had this breakage caused by us even in our own package!
#if ENABLE_LONG_OPTS || !ENABLE_ADDGROUP
/* We try to use --gid, not -g, because "standard" addgroup
* has no short option -g, it has only long --gid.
*/
argv[1] = (char*)"--gid";
#else
/* Breaks if system in fact does NOT use busybox addgroup */
argv[1] = (char*)"-g";
#endif
xargs: its lone longopt no longer depends on DESKTOP, only on LONG_OPTS.
hwclock TODO: get rid of incompatible -t, -l aliases to --systz, --localtime
Shorten help texts by omitting long option when short opt alternative exists.
Reduction of size comes from the fact that store of an immediate
(an address of longopts) to a fixed address (global variable)
is a longer insn than pushing that immediate or passing it in a register.
This effect is CPU-agnostic.
function old new delta
getopt32 1350 22 -1328
vgetopt32 - 1318 +1318
getopt32long - 24 +24
tftpd_main 562 567 +5
scan_recursive 376 380 +4
collect_cpu 545 546 +1
date_main 1096 1095 -1
hostname_main 262 259 -3
uname_main 259 255 -4
setpriv_main 362 358 -4
rmdir_main 191 187 -4
mv_main 562 558 -4
ipcalc_main 548 544 -4
ifenslave_main 641 637 -4
gzip_main 192 188 -4
gunzip_main 77 73 -4
fsfreeze_main 81 77 -4
flock_main 318 314 -4
deluser_main 337 333 -4
cp_main 374 370 -4
chown_main 175 171 -4
applet_long_options 4 - -4
xargs_main 894 889 -5
wget_main 2540 2535 -5
udhcpc_main 2767 2762 -5
touch_main 436 431 -5
tar_main 1014 1009 -5
start_stop_daemon_main 1033 1028 -5
sed_main 682 677 -5
script_main 1082 1077 -5
run_parts_main 330 325 -5
rtcwake_main 459 454 -5
od_main 2169 2164 -5
nl_main 201 196 -5
modprobe_main 773 768 -5
mkdir_main 160 155 -5
ls_main 568 563 -5
install_main 773 768 -5
hwclock_main 411 406 -5
getopt_main 622 617 -5
fstrim_main 256 251 -5
env_main 198 193 -5
dumpleases_main 635 630 -5
dpkg_main 3991 3986 -5
diff_main 1355 1350 -5
cryptpw_main 233 228 -5
cpio_main 593 588 -5
conspy_main 1135 1130 -5
chpasswd_main 313 308 -5
adduser_main 887 882 -5
addgroup_main 416 411 -5
ftpgetput_main 351 345 -6
get_terminal_width_height 242 234 -8
expand_main 690 680 -10
static.expand_longopts 18 - -18
static.unexpand_longopts 27 - -27
mkdir_longopts 28 - -28
env_longopts 30 - -30
static.ifenslave_longopts 34 - -34
mv_longopts 46 - -46
static.rmdir_longopts 48 - -48
packed_usage 31739 31687 -52
------------------------------------------------------------------------------
(add/remove: 2/8 grow/shrink: 3/49 up/down: 1352/-1840) Total: -488 bytes
text data bss dec hex filename
915681 485 6880 923046 e15a6 busybox_old
915428 485 6876 922789 e14a5 busybox_unstripped
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2017-08-08 20:08:18 +05:30
|
|
|
opt = getopt32long(argv, "it:",
|
|
|
|
"initial\0" No_argument "i"
|
|
|
|
"tabs\0" Required_argument "t"
|
|
|
|
, &opt_t
|
|
|
|
);
|
2008-03-17 14:37:36 +05:30
|
|
|
} else {
|
2017-08-09 01:25:02 +05:30
|
|
|
opt = getopt32long(argv, "^"
|
|
|
|
"ft:a"
|
|
|
|
"\0"
|
|
|
|
"ta" /* -t NUM sets -a */,
|
getopt32: remove applet_long_options
FEATURE_GETOPT_LONG made dependent on LONG_OPTS.
The folloving options are removed, now LONG_OPTS enables long options
for affected applets:
FEATURE_ENV_LONG_OPTIONS FEATURE_EXPAND_LONG_OPTIONS
FEATURE_UNEXPAND_LONG_OPTIONS FEATURE_MKDIR_LONG_OPTIONS
FEATURE_MV_LONG_OPTIONS FEATURE_RMDIR_LONG_OPTIONS
FEATURE_ADDGROUP_LONG_OPTIONS FEATURE_ADDUSER_LONG_OPTIONS
FEATURE_HWCLOCK_LONG_OPTIONS FEATURE_NSENTER_LONG_OPTS
FEATURE_CHCON_LONG_OPTIONS FEATURE_RUNCON_LONG_OPTIONS
They either had a small number of long options, or their long options are
essential.
Example: upstream addgroup and adduser have ONLY longopts,
we should probably go further and get rid
of non-standard short options.
To this end, make addgroup and adduser "select LONG_OPTS".
We had this breakage caused by us even in our own package!
#if ENABLE_LONG_OPTS || !ENABLE_ADDGROUP
/* We try to use --gid, not -g, because "standard" addgroup
* has no short option -g, it has only long --gid.
*/
argv[1] = (char*)"--gid";
#else
/* Breaks if system in fact does NOT use busybox addgroup */
argv[1] = (char*)"-g";
#endif
xargs: its lone longopt no longer depends on DESKTOP, only on LONG_OPTS.
hwclock TODO: get rid of incompatible -t, -l aliases to --systz, --localtime
Shorten help texts by omitting long option when short opt alternative exists.
Reduction of size comes from the fact that store of an immediate
(an address of longopts) to a fixed address (global variable)
is a longer insn than pushing that immediate or passing it in a register.
This effect is CPU-agnostic.
function old new delta
getopt32 1350 22 -1328
vgetopt32 - 1318 +1318
getopt32long - 24 +24
tftpd_main 562 567 +5
scan_recursive 376 380 +4
collect_cpu 545 546 +1
date_main 1096 1095 -1
hostname_main 262 259 -3
uname_main 259 255 -4
setpriv_main 362 358 -4
rmdir_main 191 187 -4
mv_main 562 558 -4
ipcalc_main 548 544 -4
ifenslave_main 641 637 -4
gzip_main 192 188 -4
gunzip_main 77 73 -4
fsfreeze_main 81 77 -4
flock_main 318 314 -4
deluser_main 337 333 -4
cp_main 374 370 -4
chown_main 175 171 -4
applet_long_options 4 - -4
xargs_main 894 889 -5
wget_main 2540 2535 -5
udhcpc_main 2767 2762 -5
touch_main 436 431 -5
tar_main 1014 1009 -5
start_stop_daemon_main 1033 1028 -5
sed_main 682 677 -5
script_main 1082 1077 -5
run_parts_main 330 325 -5
rtcwake_main 459 454 -5
od_main 2169 2164 -5
nl_main 201 196 -5
modprobe_main 773 768 -5
mkdir_main 160 155 -5
ls_main 568 563 -5
install_main 773 768 -5
hwclock_main 411 406 -5
getopt_main 622 617 -5
fstrim_main 256 251 -5
env_main 198 193 -5
dumpleases_main 635 630 -5
dpkg_main 3991 3986 -5
diff_main 1355 1350 -5
cryptpw_main 233 228 -5
cpio_main 593 588 -5
conspy_main 1135 1130 -5
chpasswd_main 313 308 -5
adduser_main 887 882 -5
addgroup_main 416 411 -5
ftpgetput_main 351 345 -6
get_terminal_width_height 242 234 -8
expand_main 690 680 -10
static.expand_longopts 18 - -18
static.unexpand_longopts 27 - -27
mkdir_longopts 28 - -28
env_longopts 30 - -30
static.ifenslave_longopts 34 - -34
mv_longopts 46 - -46
static.rmdir_longopts 48 - -48
packed_usage 31739 31687 -52
------------------------------------------------------------------------------
(add/remove: 2/8 grow/shrink: 3/49 up/down: 1352/-1840) Total: -488 bytes
text data bss dec hex filename
915681 485 6880 923046 e15a6 busybox_old
915428 485 6876 922789 e14a5 busybox_unstripped
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2017-08-08 20:08:18 +05:30
|
|
|
"first-only\0" No_argument "i"
|
|
|
|
"tabs\0" Required_argument "t"
|
|
|
|
"all\0" No_argument "a"
|
|
|
|
, &opt_t
|
|
|
|
);
|
2007-08-13 19:40:24 +05:30
|
|
|
/* -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 {
|
2008-03-17 14:37:36 +05:30
|
|
|
file = fopen_or_warn_stdin(*argv);
|
|
|
|
if (!file) {
|
|
|
|
exit_status = EXIT_FAILURE;
|
|
|
|
continue;
|
2007-08-13 19:40:24 +05:30
|
|
|
}
|
|
|
|
|
|
|
|
if (ENABLE_EXPAND && (!ENABLE_UNEXPAND || applet_name[0] == 'e'))
|
2009-04-21 16:39:40 +05:30
|
|
|
IF_EXPAND(expand(file, tab_size, opt));
|
2008-03-17 14:37:36 +05:30
|
|
|
else
|
2009-04-21 16:39:40 +05:30
|
|
|
IF_UNEXPAND(unexpand(file, tab_size, opt));
|
2007-08-13 19:40:24 +05:30
|
|
|
|
|
|
|
/* Check and close the file */
|
2008-03-17 14:37:36 +05:30
|
|
|
if (fclose_if_not_stdin(file)) {
|
2007-10-01 17:28:38 +05:30
|
|
|
bb_simple_perror_msg(*argv);
|
2007-08-13 19:40:24 +05:30
|
|
|
exit_status = EXIT_FAILURE;
|
|
|
|
}
|
|
|
|
/* If stdin also clear EOF */
|
2007-08-16 16:05:17 +05:30
|
|
|
if (file == stdin)
|
2007-08-13 19:40:24 +05:30
|
|
|
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);
|
|
|
|
}
|