diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-14 19:33:32 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-14 19:33:32 +0000 |
| commit | 8bb05ac73a5b448b339ce0bc8d396c82c459b47f (patch) | |
| tree | 1fdda006866bca20d41cb206767ea5241e36852f /sys-utils/flock.c | |
| parent | Adding debian version 2.39.3-11. (diff) | |
| download | util-linux-8bb05ac73a5b448b339ce0bc8d396c82c459b47f.tar.xz util-linux-8bb05ac73a5b448b339ce0bc8d396c82c459b47f.zip | |
Merging upstream version 2.40.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'sys-utils/flock.c')
| -rw-r--r-- | sys-utils/flock.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sys-utils/flock.c b/sys-utils/flock.c index 6079920..fed29d7 100644 --- a/sys-utils/flock.c +++ b/sys-utils/flock.c @@ -49,7 +49,7 @@ static void __attribute__((__noreturn__)) usage(void) { fputs(USAGE_HEADER, stdout); - printf( + fprintf(stdout, _(" %1$s [options] <file>|<directory> <command> [<argument>...]\n" " %1$s [options] <file>|<directory> -c <command>\n" " %1$s [options] <file descriptor number>\n"), @@ -70,8 +70,8 @@ static void __attribute__((__noreturn__)) usage(void) fputs(_( " -F, --no-fork execute command without forking\n"), stdout); fputs(_( " --verbose increase verbosity\n"), stdout); fputs(USAGE_SEPARATOR, stdout); - printf(USAGE_HELP_OPTIONS(26)); - printf(USAGE_MAN_TAIL("flock(1)")); + fprintf(stdout, USAGE_HELP_OPTIONS(26)); + fprintf(stdout, USAGE_MAN_TAIL("flock(1)")); exit(EXIT_SUCCESS); } @@ -138,7 +138,7 @@ int main(int argc, char *argv[]) int no_fork = 0; int status; int verbose = 0; - struct timeval time_start, time_done; + struct timeval time_start = { 0 }, time_done = { 0 }; /* * The default exit code for lock conflict or timeout * is specified in man flock.1 @@ -327,7 +327,7 @@ int main(int argc, char *argv[]) if (have_timeout) cancel_timer(&timer); if (verbose) { - struct timeval delta; + struct timeval delta = { 0 }; gettime_monotonic(&time_done); timersub(&time_done, &time_start, &delta); |