emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

script: make -t independent of scriptreplay

Browse Source 
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2017-08-07 01:53:17 +02:00
parent 7b8372b819
commit dd55d5d53c
3 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
NOFORK_NOEXEC.lst
View File

@ -299,8 +299,8 @@ runlevel - noexec. can be nofork if "endutxent()" is called unconditionally, but
runsv - daemon runsv - daemon
runsvdir - daemon runsvdir - daemon
rx - runner rx - runner
script script - longterm: pumps script output from slave pty
scriptreplay scriptreplay - longterm: plays back "script" saved output, sleeping as necessary.
sed - runner sed - runner
sendmail - runner sendmail - runner
seq - noexec. runner seq - noexec. runner

22
util-linux/script.c
View File

@ -21,15 +21,23 @@
//kbuild:lib-$(CONFIG_SCRIPT) += script.o //kbuild:lib-$(CONFIG_SCRIPT) += script.o
//usage:#define script_trivial_usage //usage:#define script_trivial_usage
//usage: "[-afq" IF_SCRIPTREPLAY("t") "] [-c PROG] [OUTFILE]" //usage: "[-afqt] [-c PROG] [OUTFILE]"
//usage:#define script_full_usage "\n\n" //usage:#define script_full_usage "\n\n"
//usage: " -a Append output" //usage: " -a Append output"
//usage: "\n -c PROG Run PROG, not shell" //usage: "\n -c PROG Run PROG, not shell"
//usage: "\n -f Flush output after each write" //usage: "\n -f Flush output after each write"
//usage: "\n -q Quiet" //usage: "\n -q Quiet"
//usage: IF_SCRIPTREPLAY(
//usage: "\n -t Send timing to stderr" //usage: "\n -t Send timing to stderr"
//usage: )
//util-linux-2.28:
//-t[FILE]
//-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 "libbb.h"
#include "common_bufsiz.h" #include "common_bufsiz.h"
@ -64,14 +72,14 @@ int script_main(int argc UNUSED_PARAM, char **argv)
"command\0" Required_argument "c" "command\0" Required_argument "c"
"flush\0" No_argument "f" "flush\0" No_argument "f"
"quiet\0" No_argument "q" "quiet\0" No_argument "q"
IF_SCRIPTREPLAY("timing\0" No_argument "t") "timing\0" No_argument "t"
; ;
applet_long_options = getopt_longopts; applet_long_options = getopt_longopts;
#endif #endif
opt_complementary = "?1"; /* max one arg */ opt_complementary = "?1"; /* max one arg */
opt = getopt32(argv, "ac:fq" IF_SCRIPTREPLAY("t") , &shell_arg); opt = getopt32(argv, "ac:fqt", &shell_arg);
//argc -= optind; //argc -= optind;
argv += optind; argv += optind;
if (argv[0]) { if (argv[0]) {
@ -120,7 +128,7 @@ int script_main(int argc UNUSED_PARAM, char **argv)
/* parent */ /* parent */
struct pollfd pfd[2]; struct pollfd pfd[2];
int outfd, count, loop; int outfd, count, loop;
double oldtime = ENABLE_SCRIPTREPLAY ? time(NULL) : 0; double oldtime = time(NULL);
smallint fd_count = 2; smallint fd_count = 2;
#define buf bb_common_bufsiz1 #define buf bb_common_bufsiz1
setup_common_bufsiz(); setup_common_bufsiz();
@ -151,7 +159,7 @@ int script_main(int argc UNUSED_PARAM, char **argv)
goto restore; goto restore;
} }
if (count > 0) { if (count > 0) {
if (ENABLE_SCRIPTREPLAY && (opt & OPT_t)) { if (opt & OPT_t) {
struct timeval tv; struct timeval tv;
double newtime; double newtime;

3
util-linux/scriptreplay.c
View File

@ -5,7 +5,6 @@
* pascal.bellard@ads-lu.com * pascal.bellard@ads-lu.com
* *
* Licensed under GPLv2 or later, see file LICENSE in this source tree. * Licensed under GPLv2 or later, see file LICENSE in this source tree.
*
*/ */
//config:config SCRIPTREPLAY //config:config SCRIPTREPLAY
//config: bool "scriptreplay (2.6 kb)" //config: bool "scriptreplay (2.6 kb)"
@ -19,7 +18,7 @@
//kbuild:lib-$(CONFIG_SCRIPTREPLAY) += scriptreplay.o //kbuild:lib-$(CONFIG_SCRIPTREPLAY) += scriptreplay.o
//usage:#define scriptreplay_trivial_usage //usage:#define scriptreplay_trivial_usage
//usage: "timingfile [typescript [divisor]]" //usage: "TIMINGFILE [TYPESCRIPT [DIVISOR]]"
//usage:#define scriptreplay_full_usage "\n\n" //usage:#define scriptreplay_full_usage "\n\n"
//usage: "Play back typescripts, using timing information" //usage: "Play back typescripts, using timing information"