busybox/util-linux/script.c
Denys Vlasenko 036585a911 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 17:09:40 +02:00

239 lines
6.6 KiB
C

/* vi: set sw=4 ts=4: */
/*
* script implementation for busybox
*
* pascal.bellard@ads-lu.com
*
* Based on code from util-linux v 2.12r
* Copyright (c) 1980
* The Regents of the University of California. All rights reserved.
*
* Licensed under GPLv2 or later, see file LICENSE in this source tree.
*/
//config:config SCRIPT
//config: bool "script (8 kb)"
//config: default y
//config: help
//config: The script makes typescript of terminal session.
//applet:IF_SCRIPT(APPLET(script, BB_DIR_USR_BIN, BB_SUID_DROP))
//kbuild:lib-$(CONFIG_SCRIPT) += script.o
//usage:#define script_trivial_usage
//usage: "[-afq] [-t[FILE]] [-c PROG] [OUTFILE]"
//usage:#define script_full_usage "\n\n"
//usage: "Default OUTFILE is 'typescript'"
//usage: "\n"
//usage: "\n -a Append output"
//usage: "\n -c PROG Run PROG, not shell"
/* Accepted but has no effect (we never buffer output) */
/*//usage: "\n -f Flush output after each write"*/
//usage: "\n -q Quiet"
//usage: "\n -t[FILE] Send timing to stderr or FILE"
//util-linux-2.28:
//-e: return exit code of the child
//FYI (reported as bbox bug #2749):
// > script -q -c 'echo -e -n "1\n2\n3\n"' /dev/null </dev/null >123.txt
// > The output file on full-blown ubuntu system contains 6 bytes.
// > Output on Busybox system (arm-linux) contains extra '\r' byte in each line.
//however, in my test, "script" from util-linux-2.28 seems to also add '\r' bytes.
#include "libbb.h"
#include "common_bufsiz.h"
int script_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
int script_main(int argc UNUSED_PARAM, char **argv)
{
int opt;
int mode;
int child_pid;
int attr_ok; /* NB: 0: ok */
int winsz_ok;
int pty;
char pty_line[GETPTY_BUFSIZE];
struct termios tt, rtt;
struct winsize win;
FILE *timing_fp;
const char *str_t = NULL;
const char *fname = "typescript";
const char *shell;
char shell_opt[] = "-i";
char *shell_arg = NULL;
enum {
OPT_a = (1 << 0),
OPT_c = (1 << 1),
OPT_f = (1 << 2),
OPT_q = (1 << 3),
OPT_t = (1 << 4),
};
#if ENABLE_LONG_OPTS
static const char script_longopts[] ALIGN1 =
"append\0" No_argument "a"
"command\0" Required_argument "c"
"flush\0" No_argument "f"
"quiet\0" No_argument "q"
"timing\0" Optional_argument "t"
;
#endif
opt_complementary = "?1"; /* max one arg */
opt = getopt32long(argv, "ac:fqt::", script_longopts, &shell_arg, &str_t);
//argc -= optind;
argv += optind;
if (argv[0]) {
fname = argv[0];
}
mode = O_CREAT|O_TRUNC|O_WRONLY;
if (opt & OPT_a) {
mode = O_CREAT|O_APPEND|O_WRONLY;
}
if (opt & OPT_c) {
shell_opt[1] = 'c';
}
if (!(opt & OPT_q)) {
printf("Script started, file is %s\n", fname);
}
timing_fp = stderr;
if (str_t) {
timing_fp = xfopen_for_write(str_t);
}
shell = get_shell_name();
/* Some people run "script ... 0>&-".
* Our code assumes that STDIN_FILENO != pty.
* Ensure STDIN_FILENO is not closed:
*/
bb_sanitize_stdio();
pty = xgetpty(pty_line);
/* get current stdin's tty params */
attr_ok = tcgetattr(0, &tt);
winsz_ok = ioctl(0, TIOCGWINSZ, (char *)&win);
rtt = tt;
cfmakeraw(&rtt);
rtt.c_lflag &= ~ECHO;
tcsetattr(0, TCSAFLUSH, &rtt);
/* "script" from util-linux exits when child exits,
* we wouldn't wait for EOF from slave pty
* (output may be produced by grandchildren of child) */
signal(SIGCHLD, record_signo);
/* TODO: SIGWINCH? pass window size changes down to slave? */
child_pid = xvfork();
if (child_pid) {
/* parent */
struct pollfd pfd[2];
int outfd, count, loop;
double oldtime = time(NULL);
smallint fd_count = 2;
#define buf bb_common_bufsiz1
setup_common_bufsiz();
outfd = xopen(fname, mode);
pfd[0].fd = pty;
pfd[0].events = POLLIN;
pfd[1].fd = STDIN_FILENO;
pfd[1].events = POLLIN;
ndelay_on(pty); /* this descriptor is not shared, can do this */
/* ndelay_on(STDIN_FILENO); - NO, stdin can be shared! Pity :( */
/* copy stdin to pty master input,
* copy pty master output to stdout and file */
/* TODO: don't use full_write's, use proper write buffering */
while (fd_count && !bb_got_signal) {
/* not safe_poll! we want SIGCHLD to EINTR poll */
if (poll(pfd, fd_count, -1) < 0 && errno != EINTR) {
/* If child exits too quickly, we may get EIO:
* for example, try "script -c true" */
break;
}
if (pfd[0].revents) {
errno = 0;
count = safe_read(pty, buf, COMMON_BUFSIZE);
if (count <= 0 && errno != EAGAIN) {
/* err/eof from pty: exit */
goto restore;
}
if (count > 0) {
if (opt & OPT_t) {
struct timeval tv;
double newtime;
gettimeofday(&tv, NULL);
newtime = tv.tv_sec + (double) tv.tv_usec / 1000000;
fprintf(timing_fp, "%f %u\n", newtime - oldtime, count);
oldtime = newtime;
}
full_write(STDOUT_FILENO, buf, count);
full_write(outfd, buf, count);
// If we'd be using (buffered) FILE i/o, we'd need this:
//if (opt & OPT_f) {
// fflush(outfd);
//}
}
}
if (pfd[1].revents) {
count = safe_read(STDIN_FILENO, buf, COMMON_BUFSIZE);
if (count <= 0) {
/* err/eof from stdin: don't read stdin anymore */
pfd[1].revents = 0;
fd_count--;
} else {
full_write(pty, buf, count);
}
}
}
/* If loop was exited because SIGCHLD handler set bb_got_signal,
* there still can be some buffered output. But dont loop forever:
* we won't pump orphaned grandchildren's output indefinitely.
* Testcase: running this in script:
* exec dd if=/dev/zero bs=1M count=1
* must have "1+0 records in, 1+0 records out" captured too.
* (util-linux's script doesn't do this. buggy :) */
loop = 999;
/* pty is in O_NONBLOCK mode, we exit as soon as buffer is empty */
while (--loop && (count = safe_read(pty, buf, COMMON_BUFSIZE)) > 0) {
full_write(STDOUT_FILENO, buf, count);
full_write(outfd, buf, count);
}
restore:
if (attr_ok == 0)
tcsetattr(0, TCSAFLUSH, &tt);
if (!(opt & OPT_q))
printf("Script done, file is %s\n", fname);
return EXIT_SUCCESS;
}
/* child: make pty slave to be input, output, error; run shell */
close(pty); /* close pty master */
/* open pty slave to fd 0,1,2 */
close(0);
xopen(pty_line, O_RDWR); /* uses fd 0 */
xdup2(0, 1);
xdup2(0, 2);
/* copy our original stdin tty's parameters to pty */
if (attr_ok == 0)
tcsetattr(0, TCSAFLUSH, &tt);
if (winsz_ok == 0)
ioctl(0, TIOCSWINSZ, (char *)&win);
/* set pty as a controlling tty */
setsid();
ioctl(0, TIOCSCTTY, 0 /* 0: don't forcibly steal */);
/* Non-ignored signals revert to SIG_DFL on exec anyway */
/*signal(SIGCHLD, SIG_DFL);*/
execl(shell, shell, shell_opt, shell_arg, (char *) NULL);
bb_simple_perror_msg_and_die(shell);
}