*
* Based on code from util-linux v 2.12r
* Copyright (c) 1980
- * The Regents of the University of California. All rights reserved.
+ * The Regents of the University of California. All rights reserved.
*
- * Licensed under GPLv2 or later, see file License in this tarball for details.
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
*/
-#include "libbb.h"
-
-static smallint fd_count = 2;
+//usage:#define script_trivial_usage
+//usage: "[-afq" IF_SCRIPTREPLAY("t") "] [-c PROG] [OUTFILE]"
+//usage:#define script_full_usage "\n\n"
+//usage: " -a Append output"
+//usage: "\n -c PROG Run PROG, not shell"
+//usage: "\n -f Flush output after each write"
+//usage: "\n -q Quiet"
+//usage: IF_SCRIPTREPLAY(
+//usage: "\n -t Send timing to stderr"
+//usage: )
-static void handle_sigchld(int sig ATTRIBUTE_UNUSED)
-{
- fd_count = 0;
-}
+#include "libbb.h"
int script_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
-int script_main(int argc ATTRIBUTE_UNUSED, char **argv)
+int script_main(int argc UNUSED_PARAM, char **argv)
{
int opt;
int mode;
const char *shell;
char shell_opt[] = "-i";
char *shell_arg = NULL;
-
-#if ENABLE_GETOPT_LONG
+ 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 getopt_longopts[] ALIGN1 =
"append\0" No_argument "a"
"command\0" Required_argument "c"
"flush\0" No_argument "f"
"quiet\0" No_argument "q"
+ IF_SCRIPTREPLAY("timing\0" No_argument "t")
;
applet_long_options = getopt_longopts;
#endif
+
opt_complementary = "?1"; /* max one arg */
- opt = getopt32(argv, "ac:fq", &shell_arg);
+ opt = getopt32(argv, "ac:fq" IF_SCRIPTREPLAY("t") , &shell_arg);
//argc -= optind;
argv += optind;
if (argv[0]) {
fname = argv[0];
}
mode = O_CREAT|O_TRUNC|O_WRONLY;
- if (opt & 1) {
+ if (opt & OPT_a) {
mode = O_CREAT|O_APPEND|O_WRONLY;
}
- if (opt & 2) {
+ if (opt & OPT_c) {
shell_opt[1] = 'c';
}
- if (!(opt & 8)) { /* not -q */
+ if (!(opt & OPT_q)) {
printf("Script started, file is %s\n", fname);
}
- shell = getenv("SHELL");
- if (shell == NULL) {
- shell = DEFAULT_SHELL;
- }
+ shell = get_shell_name();
- pty = getpty(pty_line);
- if (pty < 0) {
- bb_perror_msg_and_die("can't get pty");
- }
+ pty = xgetpty(pty_line);
/* get current stdin's tty params */
attr_ok = tcgetattr(0, &tt);
/* "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, handle_sigchld);
+ signal(SIGCHLD, record_signo);
/* TODO: SIGWINCH? pass window size changes down to slave? */
- child_pid = vfork();
- if (child_pid < 0) {
- bb_perror_msg_and_die("vfork");
- }
+ child_pid = xvfork();
if (child_pid) {
/* parent */
#define buf bb_common_bufsiz1
struct pollfd pfd[2];
- struct pollfd *ppfd = pfd;
int outfd, count, loop;
+ double oldtime = ENABLE_SCRIPTREPLAY ? time(NULL) : 0;
+ smallint fd_count = 2;
outfd = xopen(fname, mode);
- pfd[0].fd = 0;
+ pfd[0].fd = pty;
pfd[0].events = POLLIN;
- pfd[1].fd = pty;
+ pfd[1].fd = STDIN_FILENO;
pfd[1].events = POLLIN;
ndelay_on(pty); /* this descriptor is not shared, can do this */
- /* ndelay_on(0); - NO, stdin can be shared! Pity :( */
+ /* 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) {
+ while (fd_count && !bb_got_signal) {
/* not safe_poll! we want SIGCHLD to EINTR poll */
- poll(ppfd, fd_count, -1);
- if (pfd[0].revents) {
- count = safe_read(0, buf, sizeof(buf));
- if (count <= 0) {
- /* err/eof: don't read anymore */
- pfd[0].revents = 0;
- ppfd++;
- fd_count--;
- } else {
- full_write(pty, buf, count);
- }
+ 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[1].revents) {
+ if (pfd[0].revents) {
errno = 0;
count = safe_read(pty, buf, sizeof(buf));
if (count <= 0 && errno != EAGAIN) {
- /* err/eof: don't read anymore */
- pfd[1].revents = 0;
- fd_count--;
+ /* err/eof from pty: exit */
+ goto restore;
}
if (count > 0) {
- full_write(1, buf, count);
+ if (ENABLE_SCRIPTREPLAY && (opt & OPT_t)) {
+ struct timeval tv;
+ double newtime;
+
+ gettimeofday(&tv, NULL);
+ newtime = tv.tv_sec + (double) tv.tv_usec / 1000000;
+ fprintf(stderr, "%f %u\n", newtime - oldtime, count);
+ oldtime = newtime;
+ }
+ full_write(STDOUT_FILENO, buf, count);
full_write(outfd, buf, count);
- if (opt & 4) { /* -f */
+ if (opt & OPT_f) {
fsync(outfd);
}
}
}
+ if (pfd[1].revents) {
+ count = safe_read(STDIN_FILENO, buf, sizeof(buf));
+ 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 fd_count to 0,
- * there still can be some buffered output. But not loop forever:
+ /* 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
loop = 999;
/* pty is in O_NONBLOCK mode, we exit as soon as buffer is empty */
while (--loop && (count = safe_read(pty, buf, sizeof(buf))) > 0) {
- full_write(1, buf, count);
+ full_write(STDOUT_FILENO, buf, count);
full_write(outfd, buf, count);
}
-
+ restore:
if (attr_ok == 0)
tcsetattr(0, TCSAFLUSH, &tt);
- if (!(opt & 8)) /* not -q */
+ 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);
+ close(0);
xopen(pty_line, O_RDWR); /* uses fd 0 */
xdup2(0, 1);
xdup2(0, 2);
setsid();
ioctl(0, TIOCSCTTY, 0 /* 0: don't forcibly steal */);
- /* signal(SIGCHLD, SIG_DFL); - exec does this for us */
- execl(shell, shell, shell_opt, shell_arg, NULL);
+ /* 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);
}
projects / oweals / busybox.git / blobdiff