ericonr
/
util-linux
mirror of https://github.com/ericonr/util-linux.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Rui Zhao (renyuneyun) 2017-04-14 17:43:41 +01:00
parent d05422417e
commit bdef362d5d
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
term-utils/script.c
View File

@ -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);
}