diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-14 19:33:34 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-14 19:33:34 +0000 |
commit | 1272be04be0cb803eec87f602edb2e3e6f111aea (patch) | |
tree | bce17f6478cdd9f3c4ec3d751135dc42786d6a56 /disk-utils/fsck.c | |
parent | Releasing progress-linux version 2.39.3-11~progress7.99u1. (diff) | |
download | util-linux-1272be04be0cb803eec87f602edb2e3e6f111aea.tar.xz util-linux-1272be04be0cb803eec87f602edb2e3e6f111aea.zip |
Merging upstream version 2.40.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to '')
-rw-r--r-- | disk-utils/fsck.c | 8 | ||||
-rw-r--r-- | disk-utils/fsck.cramfs.8 | 6 | ||||
-rw-r--r-- | disk-utils/fsck.cramfs.c | 4 |
3 files changed, 9 insertions, 9 deletions
diff --git a/disk-utils/fsck.c b/disk-utils/fsck.c index 57e0758..c63ce1c 100644 --- a/disk-utils/fsck.c +++ b/disk-utils/fsck.c @@ -594,7 +594,7 @@ static int progress_active(void) */ static void print_stats(struct fsck_instance *inst) { - struct timeval delta; + struct timeval delta = { 0 }; if (!inst || !report_stats || noexecute) return; @@ -1416,11 +1416,11 @@ static void __attribute__((__noreturn__)) usage(void) fputs(_(" -V explain what is being done\n"), out); fputs(USAGE_SEPARATOR, out); - printf( " -?, --help %s\n", USAGE_OPTSTR_HELP); - printf( " --version %s\n", USAGE_OPTSTR_VERSION); + fprintf(out, " -?, --help %s\n", USAGE_OPTSTR_HELP); + fprintf(out, " --version %s\n", USAGE_OPTSTR_VERSION); fputs(USAGE_SEPARATOR, out); fputs(_("See the specific fsck.* commands for available fs-options."), out); - printf(USAGE_MAN_TAIL("fsck(8)")); + fprintf(out, USAGE_MAN_TAIL("fsck(8)")); exit(FSCK_EX_OK); } diff --git a/disk-utils/fsck.cramfs.8 b/disk-utils/fsck.cramfs.8 index 5946a87..96cd652 100644 --- a/disk-utils/fsck.cramfs.8 +++ b/disk-utils/fsck.cramfs.8 @@ -2,12 +2,12 @@ .\" Title: fsck.cramfs .\" Author: [see the "AUTHOR(S)" section] .\" Generator: Asciidoctor 2.0.20 -.\" Date: 2023-10-23 +.\" Date: 2024-01-31 .\" Manual: System Administration -.\" Source: util-linux 2.39.3 +.\" Source: util-linux 2.40 .\" Language: English .\" -.TH "FSCK.CRAMFS" "8" "2023-10-23" "util\-linux 2.39.3" "System Administration" +.TH "FSCK.CRAMFS" "8" "2024-01-31" "util\-linux 2.40" "System Administration" .ie \n(.g .ds Aq \(aq .el .ds Aq ' .ss \n[.ss] 0 diff --git a/disk-utils/fsck.cramfs.c b/disk-utils/fsck.cramfs.c index 5446084..b5d64c3 100644 --- a/disk-utils/fsck.cramfs.c +++ b/disk-utils/fsck.cramfs.c @@ -128,9 +128,9 @@ static void __attribute__((__noreturn__)) usage(void) fputs(_(" -b, --blocksize <size> use this blocksize, defaults to page size\n"), out); fputs(_(" --extract[=<dir>] test uncompression, optionally extract into <dir>\n"), out); fputs(USAGE_SEPARATOR, out); - printf(USAGE_HELP_OPTIONS(26)); + fprintf(out, USAGE_HELP_OPTIONS(26)); - printf(USAGE_MAN_TAIL("fsck.cramfs(8)")); + fprintf(out, USAGE_MAN_TAIL("fsck.cramfs(8)")); exit(FSCK_EX_OK); } |