From bdef362d5d6c2c899fc23270d9be10968a0cbdc2 Mon Sep 17 00:00:00 2001 From: Rui Zhao (renyuneyun) Date: Fri, 14 Apr 2017 17:43:41 +0100 Subject: 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) --- term-utils/script.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'term-utils') diff --git a/term-utils/script.c b/term-utils/script.c index 86f92c226..19ecddc93 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); } -- cgit v1.2.3-55-g7522