From a33f1fc432fede653e7ee58bacfee76441af2e71 Mon Sep 17 00:00:00 2001
From: Karel Zak <kzak@redhat.com>
Date: Tue, 30 Jul 2019 14:59:34 +0200
Subject: [PATCH] scriptreplay: add -T, --log-timing

Add alias to -t,--timing to make it easy to copy and past script(1)
comnand line to scriptlive(1) and scriptreplay(1) command lines.
For example:

record:
  $ script --log-timing tm --log-in in

print:
  $ scriptreplay --log-timing tm --log-in in

re-run:
  $ scriptlive --log-timing tm --log-in in

And command line is still the same.

Signed-off-by: Karel Zak <kzak@redhat.com>
---
 term-utils/scriptlive.c   |  5 ++++-
 term-utils/scriptreplay.1 |  5 +++++
 term-utils/scriptreplay.c | 12 ++++++++----
 3 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/term-utils/scriptlive.c b/term-utils/scriptlive.c
index dee099917..a27dba89e 100644
--- a/term-utils/scriptlive.c
+++ b/term-utils/scriptlive.c
@@ -69,6 +69,7 @@ usage(void)
 
 	fputs(USAGE_OPTIONS, out);
 	fputs(_(" -t, --timing <file>     script timing log file\n"), out);
+	fputs(_(" -T, --log-timing <file> alias to -t\n"), out);
 	fputs(_(" -I, --log-in <file>     script stdin log file\n"), out);
 	fputs(_(" -B, --log-io <file>     script stdin and stdout log file\n"), out);
 
@@ -201,6 +202,7 @@ main(int argc, char *argv[])
 
 	static const struct option longopts[] = {
 		{ "timing",	required_argument,	0, 't' },
+		{ "log-timing",	required_argument,	0, 'T' },
 		{ "log-in",     required_argument,      0, 'I'},
 		{ "log-io",     required_argument,      0, 'B'},
 		{ "divisor",	required_argument,	0, 'd' },
@@ -228,12 +230,13 @@ main(int argc, char *argv[])
 	replay_init_debug();
 	timerclear(&maxdelay);
 
-	while ((ch = getopt_long(argc, argv, "B:I:t:d:m:Vh", longopts, NULL)) != -1) {
+	while ((ch = getopt_long(argc, argv, "B:I:T:t:d:m:Vh", longopts, NULL)) != -1) {
 
 		err_exclusive_options(ch, longopts, excl, excl_st);
 
 		switch(ch) {
 		case 't':
+		case 'T':
 			log_tm = optarg;
 			break;
 		case 'I':
diff --git a/term-utils/scriptreplay.1 b/term-utils/scriptreplay.1
index f0593a27d..a63b46c4d 100644
--- a/term-utils/scriptreplay.1
+++ b/term-utils/scriptreplay.1
@@ -55,6 +55,11 @@ File containing \fBscript\fR's terminal output and input.
 .BR \-t , " \-\-timing " \fIfile\fR
 File containing \fBscript\fR's timing output.  This option overrides old-style arguments.
 .TP
+.BR \-T , " \-\-log\-timing " \fIfile\fR
+aliast to \fB\-t\fR, maintained for compatibility with
+.B script (1)
+command line options.
+.TP
 .BR \-s , " \-\-typescript " \fIfile\fR
 File containing \fBscript\fR's terminal output.  Deprecated alias to \fB\-\-log-out\fR.
 This option overrides old-style arguments.
diff --git a/term-utils/scriptreplay.c b/term-utils/scriptreplay.c
index da9e4fb12..906d9c565 100644
--- a/term-utils/scriptreplay.c
+++ b/term-utils/scriptreplay.c
@@ -54,9 +54,11 @@ usage(void)
 
 	fputs(USAGE_OPTIONS, out);
 	fputs(_(" -t, --timing <file>     script timing log file\n"), out);
+	fputs(_(" -T, --log-timing <file> aliast to -t\n"), out);
 	fputs(_(" -I, --log-in <file>     script stdin log file\n"), out);
 	fputs(_(" -O, --log-out <file>    script stdout log file (default)\n"), out);
 	fputs(_(" -B, --log-io <file>     script stdin and stdout log file\n"), out);
+	fputs(USAGE_SEPARATOR, out);
 	fputs(_(" -s, --typescript <file> deprecated alist to -O\n"), out);
 
 	fputs(USAGE_SEPARATOR, out);
@@ -141,9 +143,10 @@ main(int argc, char *argv[])
 	static const struct option longopts[] = {
 		{ "cr-mode",    required_argument,	0, 'c' },
 		{ "timing",	required_argument,	0, 't' },
-		{ "log-in",     required_argument,      0, 'I'},
-		{ "log-out",    required_argument,      0, 'O'},
-		{ "log-io",     required_argument,      0, 'B'},
+		{ "log-timing", required_argument,      0, 'T' },
+		{ "log-in",     required_argument,      0, 'I' },
+		{ "log-out",    required_argument,      0, 'O' },
+		{ "log-io",     required_argument,      0, 'B' },
 		{ "typescript",	required_argument,	0, 's' },
 		{ "divisor",	required_argument,	0, 'd' },
 		{ "maxdelay",	required_argument,	0, 'm' },
@@ -172,7 +175,7 @@ main(int argc, char *argv[])
 	replay_init_debug();
 	timerclear(&maxdelay);
 
-	while ((ch = getopt_long(argc, argv, "B:c:I:O:t:s:d:m:x:Vh", longopts, NULL)) != -1) {
+	while ((ch = getopt_long(argc, argv, "B:c:I:O:T:t:s:d:m:x:Vh", longopts, NULL)) != -1) {
 
 		err_exclusive_options(ch, longopts, excl, excl_st);
 
@@ -188,6 +191,7 @@ main(int argc, char *argv[])
 				errx(EXIT_FAILURE, _("unsupported mode name: '%s'"), optarg);
 			break;
 		case 't':
+		case 'T':
 			log_tm = optarg;
 			break;
 		case 'O':