aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--usr.bin/script/script.121
-rw-r--r--usr.bin/script/script.c150
2 files changed, 96 insertions, 75 deletions
diff --git a/usr.bin/script/script.1 b/usr.bin/script/script.1
index 6c0f7d697ea7..4acda57273a6 100644
--- a/usr.bin/script/script.1
+++ b/usr.bin/script/script.1
@@ -30,7 +30,7 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)script.1 8.1 (Berkeley) 6/6/93
-.\" $Id$
+.\" $Id: script.1,v 1.3 1997/12/29 13:31:46 peter Exp $
.\"
.Dd June 6, 1993
.Dt SCRIPT 1
@@ -41,7 +41,9 @@
.Sh SYNOPSIS
.Nm
.Op Fl a
+.Op Fl k
.Op Fl q
+.Op Fl t Ar time
.Op Ar file
.Op Ar command ...
.Sh DESCRIPTION
@@ -68,16 +70,23 @@ is given,
will run the specified command with an optional argument vector
instead of an interactive shell.
.Pp
-Option:
-.Bl -tag -width Ds
+Options:
+.Bl -tag -width xxxxxxx
.It Fl a
Append the output to
.Ar file
or
.Pa typescript ,
retaining the prior contents.
+.It Fl k
+Log keys sent to program as well as output.
.It Fl q
Run in quiet mode, omit the start and stop status messages.
+.It Fl t Ar time
+Specify time interval between flushing script output file. A value of 0
+causes
+.Nm
+to flush for every character I/O event.
.El
.Pp
The script ends when the forked shell (or command) exits (a
@@ -136,3 +145,9 @@ This is not what the naive user expects.
.Pp
It is not possible to specify a command without also naming the script file
because of argument parsing compatability issues.
+.Pp
+When running in
+.Fl k
+mode, echo cancelling far from ideal. The slave terminal mode is checked
+for ECHO mode to check when to avoid manual echo logging. This does not
+work when in a raw mode where the program being run is doing manual echo.
diff --git a/usr.bin/script/script.c b/usr.bin/script/script.c
index 94e4ce08a594..5e8d8e7e84de 100644
--- a/usr.bin/script/script.c
+++ b/usr.bin/script/script.c
@@ -42,7 +42,7 @@ static const char copyright[] =
static char sccsid[] = "@(#)script.c 8.1 (Berkeley) 6/6/93";
#endif
static const char rcsid[] =
- "$Id: script.c,v 1.6 1997/12/29 13:31:46 peter Exp $";
+ "$Id: script.c,v 1.7 1997/12/30 01:20:08 peter Exp $";
#endif /* not lint */
#include <sys/types.h>
@@ -52,6 +52,7 @@ static const char rcsid[] =
#include <sys/time.h>
#include <err.h>
+#include <errno.h>
#include <fcntl.h>
#include <libutil.h>
#include <paths.h>
@@ -64,8 +65,7 @@ static const char rcsid[] =
FILE *fscript;
int master, slave;
-int child, subchild;
-int outcc;
+int child;
char *fname;
int qflg;
@@ -76,7 +76,6 @@ void dooutput __P((void));
void doshell __P((char **));
void fail __P((void));
void finish __P((int));
-void scriptflush __P((int));
static void usage __P((void));
int
@@ -85,13 +84,19 @@ main(argc, argv)
char *argv[];
{
register int cc;
- struct termios rtt;
+ struct termios rtt, stt;
struct winsize win;
- int aflg, ch;
+ int aflg, kflg, ch, n;
+ struct timeval tv, *tvp;
+ time_t tvec, start;
+ char obuf[BUFSIZ];
char ibuf[BUFSIZ];
+ fd_set rfd;
+ int flushtime = 30;
+ int lastc = 1000;
- aflg = 0;
- while ((ch = getopt(argc, argv, "aq")) != -1)
+ aflg = kflg = 0;
+ while ((ch = getopt(argc, argv, "aqkt:")) != -1)
switch(ch) {
case 'a':
aflg = 1;
@@ -99,6 +104,14 @@ main(argc, argv)
case 'q':
qflg = 1;
break;
+ case 'k':
+ kflg = 1;
+ break;
+ case 't':
+ flushtime = atoi(optarg);
+ if (flushtime < 0)
+ err(1, "invalid flush time %d", flushtime);
+ break;
case '?':
default:
usage();
@@ -121,8 +134,12 @@ main(argc, argv)
if (openpty(&master, &slave, NULL, &tt, &win) == -1)
err(1, "openpty");
- if (!qflg)
+ if (!qflg) {
+ tvec = time(NULL);
(void)printf("Script started, output file is %s\n", fname);
+ (void)fprintf(fscript, "Script started on %s", ctime(&tvec));
+ fflush(fscript);
+ }
rtt = tt;
cfmakeraw(&rtt);
rtt.c_lflag &= ~ECHO;
@@ -134,28 +151,59 @@ main(argc, argv)
warn("fork");
fail();
}
- if (child == 0) {
- subchild = child = fork();
- if (child < 0) {
- warn("fork");
- fail();
+ if (child == 0)
+ doshell(argv);
+
+ if (flushtime > 0)
+ tvp = &tv;
+ else
+ tvp = NULL;
+
+ start = time(0);
+ FD_ZERO(&rfd);
+ for (;;) {
+ FD_SET(master, &rfd);
+ FD_SET(STDIN_FILENO, &rfd);
+ if (flushtime > 0) {
+ tv.tv_sec = flushtime;
+ tv.tv_usec = 0;
+ }
+ n = select(master + 1, &rfd, 0, 0, tvp);
+ if (n < 0 && errno != EINTR)
+ break;
+ if (n > 0 && FD_ISSET(STDIN_FILENO, &rfd)) {
+ cc = read(STDIN_FILENO, ibuf, BUFSIZ);
+ if (cc <= 0)
+ break;
+ if (cc > 0) {
+ (void)write(master, ibuf, cc);
+ if (kflg && tcgetattr(master, &stt) >= 0 &&
+ ((stt.c_lflag & ECHO) == 0)) {
+ (void)fwrite(ibuf, 1, cc, fscript);
+ }
+ }
+ }
+ if (n > 0 && FD_ISSET(master, &rfd)) {
+ cc = read(master, obuf, sizeof (obuf));
+ if (cc <= 0)
+ break;
+ (void)write(1, obuf, cc);
+ (void)fwrite(obuf, 1, cc, fscript);
+ }
+ tvec = time(0);
+ if (tvec - start >= flushtime) {
+ fflush(fscript);
+ start = tvec;
}
- if (child)
- dooutput();
- else
- doshell(argv);
}
-
- (void)fclose(fscript);
- while ((cc = read(STDIN_FILENO, ibuf, BUFSIZ)) > 0)
- (void)write(master, ibuf, cc);
done();
}
static void
usage()
{
- (void)fprintf(stderr, "usage: script [-a] [-q] [file] [command]\n");
+ (void)fprintf(stderr,
+ "usage: script [-a] [-q] [-k] [-t time] [file] [command]\n");
exit(1);
}
@@ -176,45 +224,6 @@ finish(signo)
}
void
-dooutput()
-{
- struct itimerval value;
- register int cc;
- time_t tvec;
- char obuf[BUFSIZ];
-
- (void)close(STDIN_FILENO);
- tvec = time(NULL);
- if (!qflg)
- (void)fprintf(fscript, "Script started on %s", ctime(&tvec));
-
- (void)signal(SIGALRM, scriptflush);
- value.it_interval.tv_sec = 60 / 2;
- value.it_interval.tv_usec = 0;
- value.it_value = value.it_interval;
- (void)setitimer(ITIMER_REAL, &value, NULL);
- for (;;) {
- cc = read(master, obuf, sizeof (obuf));
- if (cc <= 0)
- break;
- (void)write(1, obuf, cc);
- (void)fwrite(obuf, 1, cc, fscript);
- outcc += cc;
- }
- done();
-}
-
-void
-scriptflush(signo)
- int signo;
-{
- if (outcc) {
- (void)fflush(fscript);
- outcc = 0;
- }
-}
-
-void
doshell(av)
char **av;
{
@@ -248,16 +257,13 @@ done()
{
time_t tvec;
- if (subchild) {
- tvec = time(NULL);
- if (!qflg)
- (void)fprintf(fscript,"\nScript done on %s", ctime(&tvec));
- (void)fclose(fscript);
- (void)close(master);
- } else {
- (void)tcsetattr(STDIN_FILENO, TCSAFLUSH, &tt);
- if (!qflg)
- (void)printf("Script done, output file is %s\n", fname);
+ (void)tcsetattr(STDIN_FILENO, TCSAFLUSH, &tt);
+ tvec = time(NULL);
+ if (!qflg) {
+ (void)fprintf(fscript,"\nScript done on %s", ctime(&tvec));
+ (void)printf("\nScript done, output file is %s\n", fname);
}
+ (void)fclose(fscript);
+ (void)close(master);
exit(0);
}