From: Rui Zhao (renyuneyun) <renyuneyun@gmail.com>
Date: Fri, 14 Apr 2017 16:43:41 +0000 (+0100)
Subject: fix the position of newline in the time output of 'script'
X-Git-Tag: v2.30-rc1~101^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bdef362d5d6c2c899fc23270d9be10968a0cbdc2;p=thirdparty%2Futil-linux.git

fix the position of newline in the time output of 'script'

- move '\n' to fprintf
- use `timeutils/strtime_iso()` instead of `strtime()`

Signed-off-by: Rui Zhao (renyuneyun) <renyuneyun@gmail.com>
---

diff --git a/term-utils/script.c b/term-utils/script.c
index 86f92c2264..19ecddc933 100644
--- a/term-utils/script.c
+++ b/term-utils/script.c
@@ -70,6 +70,7 @@
 #include "ttyutils.h"
 #include "all-io.h"
 #include "monotonic.h"
+#include "timeutils.h"
 
 #include "debug.h"
 
@@ -435,8 +436,10 @@ static void do_io(struct script_control *ctl)
 
 
 	if (!ctl->quiet && ctl->typescriptfp) {
-		strftime(buf, sizeof buf, "%c\n", localtime(&tvec));
-		fprintf(ctl->typescriptfp, _("Script started on %s"), buf);
+		strtime_iso(&tvec, ISO_8601_DATE | ISO_8601_TIME | ISO_8601_DOTUSEC |
+				ISO_8601_TIMEZONE | ISO_8601_SPACE,
+				buf, sizeof(buf));
+		fprintf(ctl->typescriptfp, _("Script started on %s\n"), buf);
 	}
 	gettime_monotonic(&ctl->oldtime);
 
@@ -509,8 +512,10 @@ static void do_io(struct script_control *ctl)
 		wait_for_child(ctl, 1);
 	if (!ctl->quiet && ctl->typescriptfp) {
 		tvec = script_time((time_t *)NULL);
-		strftime(buf, sizeof buf, "%c\n", localtime(&tvec));
-		fprintf(ctl->typescriptfp, _("\nScript done on %s"), buf);
+		strtime_iso(&tvec, ISO_8601_DATE | ISO_8601_TIME | ISO_8601_DOTUSEC |
+				ISO_8601_TIMEZONE | ISO_8601_SPACE,
+				buf, sizeof(buf));
+		fprintf(ctl->typescriptfp, _("\nScript done on %s\n"), buf);
 	}
 	done(ctl);
 }