You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
126 lines
3.4 KiB
126 lines
3.4 KiB
diff --git a/term-utils/script.1 b/term-utils/script.1
|
|
index 1e430d8..1808a37 100644
|
|
--- a/term-utils/script.1
|
|
+++ b/term-utils/script.1
|
|
@@ -84,14 +84,21 @@ or symbolic link. The command will follow a symbolic link.
|
|
\fB\-q\fR, \fB\-\-quiet\fR
|
|
Be quiet.
|
|
.TP
|
|
-\fB\-t\fR, \fB\-\-timing\fR[=\fIfile\fR]
|
|
-Output timing data to standard error, or to
|
|
+\fB\-t\fR, \fB\-\-timing\fR[=\fIfile|descriptor\fR]
|
|
+Output timing data to standard error, or to a
|
|
.I file
|
|
+or
|
|
+.I descriptor
|
|
when given. This data contains two fields, separated by a space. The first
|
|
field indicates how much time elapsed since the previous output. The second
|
|
field indicates how many characters were output this time. This information
|
|
can be used to replay typescripts with realistic typing and output delays.
|
|
.TP
|
|
+\fB\-d\fR, \fB\-\-descriptor\fR
|
|
+Use this option in combination with
|
|
+.I --timing
|
|
+for using the given resource as a file descriptor number as destination for timing data
|
|
+.TP
|
|
\fB\-V\fR, \fB\-\-version\fR
|
|
Output version information and exit.
|
|
.TP
|
|
diff --git a/term-utils/script.c b/term-utils/script.c
|
|
index 242b815..778fbbe 100644
|
|
--- a/term-utils/script.c
|
|
+++ b/term-utils/script.c
|
|
@@ -101,12 +101,14 @@ int l;
|
|
char line[] = "/dev/ptyXX";
|
|
#endif
|
|
int aflg = 0;
|
|
+int dflg = 0;
|
|
char *cflg = NULL;
|
|
int eflg = 0;
|
|
int fflg = 0;
|
|
int qflg = 0;
|
|
int tflg = 0;
|
|
int forceflg = 0;
|
|
+int fdnum_typescript = 0;
|
|
|
|
int die;
|
|
int resized;
|
|
@@ -171,6 +173,7 @@ main(int argc, char **argv) {
|
|
{ "force", no_argument, NULL, FORCE_OPTION, },
|
|
{ "quiet", no_argument, NULL, 'q' },
|
|
{ "timing", optional_argument, NULL, 't' },
|
|
+ { "descriptor", no_argument, NULL, 'd' },
|
|
{ "version", no_argument, NULL, 'V' },
|
|
{ "help", no_argument, NULL, 'h' },
|
|
{ NULL, 0, NULL, 0 }
|
|
@@ -182,8 +185,10 @@ main(int argc, char **argv) {
|
|
textdomain(PACKAGE);
|
|
atexit(close_stdout);
|
|
|
|
- while ((ch = getopt_long(argc, argv, "ac:efqt::Vh", longopts, NULL)) != -1)
|
|
+ while ((ch = getopt_long(argc, argv, "dac:efqt::Vh", longopts, NULL)) != -1)
|
|
switch(ch) {
|
|
+ case 'd':
|
|
+ dflg = 1;
|
|
case 'a':
|
|
aflg = 1;
|
|
break;
|
|
@@ -229,7 +234,22 @@ main(int argc, char **argv) {
|
|
fname = DEFAULT_OUTPUT;
|
|
die_if_link(fname);
|
|
}
|
|
- if ((fscript = fopen(fname, aflg ? "a" : "w")) == NULL) {
|
|
+
|
|
+
|
|
+ if (dflg == 1){
|
|
+
|
|
+ fdnum_typescript = atoi(fname);
|
|
+
|
|
+ if (fdnum_typescript == 0){
|
|
+ warn(_("file descriptor is not a number"));
|
|
+ fail();
|
|
+ }
|
|
+
|
|
+ if ((fscript = fdopen (fdnum_typescript, "w")) == NULL) {
|
|
+ warn(_("cannot open fd %s"), fname);
|
|
+ fail();
|
|
+ }
|
|
+ }else if((fscript = fopen(fname, aflg ? "a" : "w")) == NULL) {
|
|
warn(_("cannot open %s"), fname);
|
|
fail();
|
|
}
|
|
@@ -239,8 +259,15 @@ main(int argc, char **argv) {
|
|
shell = _PATH_BSHELL;
|
|
|
|
getmaster();
|
|
- if (!qflg)
|
|
+
|
|
+ if (!qflg) {
|
|
+ if (dflg == 1){
|
|
+ printf(_("Script started, file descriptor number is %s\n"), fname);
|
|
+ }else{
|
|
printf(_("Script started, file is %s\n"), fname);
|
|
+ }
|
|
+ }
|
|
+
|
|
fixtty();
|
|
|
|
#ifdef HAVE_LIBUTEMPTER
|
|
@@ -495,8 +520,16 @@ done(void) {
|
|
master = -1;
|
|
} else {
|
|
tcsetattr(STDIN_FILENO, TCSADRAIN, &tt);
|
|
- if (!qflg)
|
|
+
|
|
+ if (!qflg) {
|
|
+ if (dflg == 1){
|
|
+ printf(_("Script done, file descriptor number is %s\n"), fname);
|
|
+ }else{
|
|
printf(_("Script done, file is %s\n"), fname);
|
|
+ }
|
|
+ }
|
|
+
|
|
+
|
|
#ifdef HAVE_LIBUTEMPTER
|
|
if (master >= 0)
|
|
utempter_remove_record(master);
|