diff options
| author | Karel Zak | 2017-04-18 12:12:44 +0200 |
|---|---|---|
| committer | Karel Zak | 2017-04-18 12:12:44 +0200 |
| commit | 6f3c9c34306cb40115dc878629667c22a36115a4 (patch) | |
| tree | d34ba43f5ebdb70f2fe02b99afef5232c220ca74 | |
| parent | Merge branch 'script_newline' of https://github.com/renyuneyun/util-linux (diff) | |
| download | kernel-qcow2-util-linux-6f3c9c34306cb40115dc878629667c22a36115a4.tar.gz kernel-qcow2-util-linux-6f3c9c34306cb40115dc878629667c22a36115a4.tar.xz kernel-qcow2-util-linux-6f3c9c34306cb40115dc878629667c22a36115a4.zip | |
script: always write stat and done message to typescript file
And remove usec from timestamp.
Signed-off-by: Karel Zak <kzak@redhat.com>
| -rw-r--r-- | term-utils/script.1 | 3 | ||||
| -rw-r--r-- | term-utils/script.c | 9 |
2 files changed, 6 insertions, 6 deletions
diff --git a/term-utils/script.1 b/term-utils/script.1 index 5c366b129..ff3ef528d 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 19ecddc93..f2fc2f59c 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); |