From: Karel Zak <kzak@redhat.com>
Date: Tue, 18 Apr 2017 10:12:44 +0000 (+0200)
Subject: script: always write stat and done message to typescript file
X-Git-Tag: v2.30-rc1~100
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6f3c9c34306cb40115dc878629667c22a36115a4;p=thirdparty%2Futil-linux.git

script: always write stat and done message to typescript file

And remove usec from timestamp.

Signed-off-by: Karel Zak <kzak@redhat.com>
---

diff --git a/term-utils/script.1 b/term-utils/script.1
index 5c366b1292..ff3ef528df 100644
--- a/term-utils/script.1
+++ b/term-utils/script.1
@@ -83,8 +83,7 @@ Allow the default output destination, i.e. the typescript file, to be a hard
 or symbolic link.  The command will follow a symbolic link.
 .TP
 \fB\-q\fR, \fB\-\-quiet\fR
-Be quiet (do not write start and done messages to either standard output
-or the typescript file).
+Be quiet (do not write start and done messages to standard output).
 .TP
 \fB\-t\fR, \fB\-\-timing\fR[=\fIfile\fR]
 Output timing data to standard error, or to
diff --git a/term-utils/script.c b/term-utils/script.c
index 19ecddc933..f2fc2f59c6 100644
--- a/term-utils/script.c
+++ b/term-utils/script.c
@@ -435,8 +435,8 @@ static void do_io(struct script_control *ctl)
 	}
 
 
-	if (!ctl->quiet && ctl->typescriptfp) {
-		strtime_iso(&tvec, ISO_8601_DATE | ISO_8601_TIME | ISO_8601_DOTUSEC |
+	if (ctl->typescriptfp) {
+		strtime_iso(&tvec, ISO_8601_DATE | ISO_8601_TIME |
 				ISO_8601_TIMEZONE | ISO_8601_SPACE,
 				buf, sizeof(buf));
 		fprintf(ctl->typescriptfp, _("Script started on %s\n"), buf);
@@ -510,9 +510,10 @@ static void do_io(struct script_control *ctl)
 
 	if (!ctl->die)
 		wait_for_child(ctl, 1);
-	if (!ctl->quiet && ctl->typescriptfp) {
+
+	if (ctl->typescriptfp) {
 		tvec = script_time((time_t *)NULL);
-		strtime_iso(&tvec, ISO_8601_DATE | ISO_8601_TIME | ISO_8601_DOTUSEC |
+		strtime_iso(&tvec, ISO_8601_DATE | ISO_8601_TIME |
 				ISO_8601_TIMEZONE | ISO_8601_SPACE,
 				buf, sizeof(buf));
 		fprintf(ctl->typescriptfp, _("\nScript done on %s\n"), buf);