From c13ce8f4d6cf8997e8f2bb1ae8a40f15c51ced5a Mon Sep 17 00:00:00 2001 From: Karel Zak Date: Thu, 6 May 2021 10:13:27 +0200 Subject: [PATCH] fsck: fix time_t=long assumptions References: http://github.com/karelzak/util-linux/commit/ce3355cc54d97711bc240783324f7ab51fd6e371 Signed-off-by: Karel Zak --- disk-utils/fsck.c | 30 +++++++++++++++++------------- 1 file changed, 17 insertions(+), 13 deletions(-) diff --git a/disk-utils/fsck.c b/disk-utils/fsck.c index ec0e374a0..fe114d729 100644 --- a/disk-utils/fsck.c +++ b/disk-utils/fsck.c @@ -597,27 +597,31 @@ static void print_stats(struct fsck_instance *inst) timersub(&inst->end_time, &inst->start_time, &delta); if (report_stats_file) - fprintf(report_stats_file, "%s %d %ld " - "%ld.%06ld %ld.%06ld %ld.%06ld\n", + fprintf(report_stats_file, "%s %d %ld" + " %"PRId64".%06"PRId64 + " %"PRId64".%06"PRId64 + " %"PRId64".%06"PRId64"\n", fs_get_device(inst->fs), inst->exit_status, inst->rusage.ru_maxrss, - (long)delta.tv_sec, (long)delta.tv_usec, - (long)inst->rusage.ru_utime.tv_sec, - (long)inst->rusage.ru_utime.tv_usec, - (long)inst->rusage.ru_stime.tv_sec, - (long)inst->rusage.ru_stime.tv_usec); + (int64_t)delta.tv_sec, (int64_t)delta.tv_usec, + (int64_t)inst->rusage.ru_utime.tv_sec, + (int64_t)inst->rusage.ru_utime.tv_usec, + (int64_t)inst->rusage.ru_stime.tv_sec, + (int64_t)inst->rusage.ru_stime.tv_usec); else fprintf(stdout, "%s: status %d, rss %ld, " - "real %ld.%06ld, user %ld.%06ld, sys %ld.%06ld\n", + "real %"PRId64".%06"PRId64", " + "user %"PRId64".%06"PRId64", " + "sys %"PRId64".%06"PRId64"\n", fs_get_device(inst->fs), inst->exit_status, inst->rusage.ru_maxrss, - (long)delta.tv_sec, (long)delta.tv_usec, - (long)inst->rusage.ru_utime.tv_sec, - (long)inst->rusage.ru_utime.tv_usec, - (long)inst->rusage.ru_stime.tv_sec, - (long)inst->rusage.ru_stime.tv_usec); + (int64_t)delta.tv_sec, (int64_t)delta.tv_usec, + (int64_t)inst->rusage.ru_utime.tv_sec, + (int64_t)inst->rusage.ru_utime.tv_usec, + (int64_t)inst->rusage.ru_stime.tv_sec, + (int64_t)inst->rusage.ru_stime.tv_usec); } /*