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

script: make -t[FILE] compatible with util-linux

Browse Source 
function                                             old     new   delta
script_main                                         1056    1102     +46
packed_usage                                       31736   31765     +29
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 2/0 up/down: 75/0)               Total: 75 bytes

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2017-08-07 02:12:36 +02:00
parent dd55d5d53c
commit 269b36a49a
2 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
editors/sed.c
View File

@ -68,8 +68,8 @@
//applet:IF_SED(APPLET(sed, BB_DIR_BIN, BB_SUID_DROP)) //applet:IF_SED(APPLET(sed, BB_DIR_BIN, BB_SUID_DROP))
//usage:#define sed_trivial_usage //usage:#define sed_trivial_usage
//usage: "[-inrE] [-f FILE]... [-e CMD]... [FILE]...\n" //usage: "[-i[SFX]] [-nrE] [-f FILE]... [-e CMD]... [FILE]...\n"
//usage: "or: sed [-inrE] CMD [FILE]..." //usage: "or: sed [-i[SFX]] [-nrE] CMD [FILE]..."
//usage:#define sed_full_usage "\n\n" //usage:#define sed_full_usage "\n\n"
//usage: " -e CMD Add CMD to sed commands to be executed" //usage: " -e CMD Add CMD to sed commands to be executed"
//usage: "\n -f FILE Add FILE contents to sed commands to be executed" //usage: "\n -f FILE Add FILE contents to sed commands to be executed"

22
util-linux/script.c
View File

@ -21,16 +21,17 @@
//kbuild:lib-$(CONFIG_SCRIPT) += script.o //kbuild:lib-$(CONFIG_SCRIPT) += script.o
//usage:#define script_trivial_usage //usage:#define script_trivial_usage
//usage: "[-afqt] [-c PROG] [OUTFILE]" //usage: "[-afq] [-t[FILE]] [-c PROG] [OUTFILE]"
//usage:#define script_full_usage "\n\n" //usage:#define script_full_usage "\n\n"
//usage: " -a Append output" //usage: "Default OUTFILE is 'typescript'"
//usage: "\n"
//usage: "\n -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: "\n -t Send timing to stderr" //usage: "\n -t[FILE] Send timing to stderr or FILE"
//util-linux-2.28: //util-linux-2.28:
//-t[FILE]
//-e: return exit code of the child //-e: return exit code of the child
//FYI (reported as bbox bug #2749): //FYI (reported as bbox bug #2749):
@ -54,6 +55,8 @@ int script_main(int argc UNUSED_PARAM, char **argv)
char pty_line[GETPTY_BUFSIZE]; char pty_line[GETPTY_BUFSIZE];
struct termios tt, rtt; struct termios tt, rtt;
struct winsize win; struct winsize win;
FILE *timing_fp;
const char *str_t = NULL;
const char *fname = "typescript"; const char *fname = "typescript";
const char *shell; const char *shell;
char shell_opt[] = "-i"; char shell_opt[] = "-i";
@ -72,14 +75,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"
"timing\0" No_argument "t" "timing\0" Optional_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:fqt", &shell_arg); opt = getopt32(argv, "ac:fqt::", &shell_arg, &str_t);
//argc -= optind; //argc -= optind;
argv += optind; argv += optind;
if (argv[0]) { if (argv[0]) {
@ -95,6 +98,10 @@ int script_main(int argc UNUSED_PARAM, char **argv)
if (!(opt & OPT_q)) { if (!(opt & OPT_q)) {
printf("Script started, file is %s\n", fname); 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(); shell = get_shell_name();
@ -130,6 +137,7 @@ int script_main(int argc UNUSED_PARAM, char **argv)
int outfd, count, loop; int outfd, count, loop;
double oldtime = time(NULL); 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();
@ -165,7 +173,7 @@ int script_main(int argc UNUSED_PARAM, char **argv)
gettimeofday(&tv, NULL); gettimeofday(&tv, NULL);
newtime = tv.tv_sec + (double) tv.tv_usec / 1000000; newtime = tv.tv_sec + (double) tv.tv_usec / 1000000;
fprintf(stderr, "%f %u\n", newtime - oldtime, count); fprintf(timing_fp, "%f %u\n", newtime - oldtime, count);
oldtime = newtime; oldtime = newtime;
} }
full_write(STDOUT_FILENO, buf, count); full_write(STDOUT_FILENO, buf, count);