From: James Hunt <james.hunt@ubuntu.com>
Date: Sat, 21 Jun 2014 23:03:04 +0000 (+0200)
Subject: script: --quiet option is not quiet.
X-Git-Tag: v2.25-rc2~47
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1474c09ea86cdded54187d4157536172090139a4;p=thirdparty%2Futil-linux.git

script: --quiet option is not quiet.

Specifying 'script --quiet ...' still produces the 'Script started'
message in the typescript file. The --quiet option implies that the
script program should not log any of its output to the typescript file.

Originally reported at:
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=693966

Signed-off-by: Andreas Henriksson <andreas@fatal.se>
---

diff --git a/term-utils/script.1 b/term-utils/script.1
index 60a0e53a0e..67e1066880 100644
--- a/term-utils/script.1
+++ b/term-utils/script.1
@@ -82,7 +82,8 @@ 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.
+Be quiet (do not write start and done messages to either standard output
+or the typescript file).
 .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 1530e6726e..21fb5af9ec 100644
--- a/term-utils/script.c
+++ b/term-utils/script.c
@@ -437,7 +437,8 @@ dooutput(void) {
 
 	tvec = time((time_t *)NULL);
 	my_strftime(obuf, sizeof obuf, "%c\n", localtime(&tvec));
-	fprintf(fscript, _("Script started on %s"), obuf);
+	if (!qflg)
+		fprintf(fscript, _("Script started on %s"), obuf);
 
 	FD_ZERO(&readfds);