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

fsck: fix time_t=long assumptions 

References: ce3355cc54
Signed-off-by: Karel Zak <kzak@redhat.com>
This commit is contained in:
Karel Zak 2021-05-06 10:13:27 +02:00
parent 7b20bb1acc
commit c13ce8f4d6
1 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
disk-utils/fsck.c
View File

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