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 /disk-utils/mkfs.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 '')
-rw-r--r-- | disk-utils/mkfs.c | 4 | ||||
-rw-r--r-- | disk-utils/mkfs.cramfs.8 | 6 | ||||
-rw-r--r-- | disk-utils/mkfs.cramfs.c | 36 |
3 files changed, 23 insertions, 23 deletions
diff --git a/disk-utils/mkfs.c b/disk-utils/mkfs.c index 4254ef0..00d224f 100644 --- a/disk-utils/mkfs.c +++ b/disk-utils/mkfs.c @@ -62,9 +62,9 @@ static void __attribute__((__noreturn__)) usage(void) fprintf(out, _(" <size> number of blocks to be used on the device\n")); fprintf(out, _(" -V, --verbose explain what is being done;\n" " specifying -V more than once will cause a dry-run\n")); - printf(USAGE_HELP_OPTIONS(20)); + fprintf(out, USAGE_HELP_OPTIONS(20)); - printf(USAGE_MAN_TAIL("mkfs(8)")); + fprintf(out, USAGE_MAN_TAIL("mkfs(8)")); exit(EXIT_SUCCESS); } diff --git a/disk-utils/mkfs.cramfs.8 b/disk-utils/mkfs.cramfs.8 index 9eef51a..4f39779 100644 --- a/disk-utils/mkfs.cramfs.8 +++ b/disk-utils/mkfs.cramfs.8 @@ -2,12 +2,12 @@ .\" Title: mkfs.cramfs .\" Author: [see the "AUTHOR(S)" section] .\" Generator: Asciidoctor 2.0.20 -.\" Date: 2023-11-21 +.\" Date: 2024-01-31 .\" Manual: System Administration -.\" Source: util-linux 2.39.3 +.\" Source: util-linux 2.40 .\" Language: English .\" -.TH "MKFS.CRAMFS" "8" "2023-11-21" "util\-linux 2.39.3" "System Administration" +.TH "MKFS.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/mkfs.cramfs.c b/disk-utils/mkfs.cramfs.c index fcc1314..f4ada90 100644 --- a/disk-utils/mkfs.cramfs.c +++ b/disk-utils/mkfs.cramfs.c @@ -128,27 +128,27 @@ struct entry { static void __attribute__((__noreturn__)) usage(void) { fputs(USAGE_HEADER, stdout); - printf(_(" %s [-h] [-v] [-b blksize] [-e edition] [-N endian] [-i file] [-n name] dirname outfile\n"), + fprintf(stdout, _(" %s [-h] [-v] [-b blksize] [-e edition] [-N endian] [-i file] [-n name] dirname outfile\n"), program_invocation_short_name); fputs(USAGE_SEPARATOR, stdout); - puts(_("Make compressed ROM file system.")); + fputsln(_("Make compressed ROM file system."), stdout); fputs(USAGE_OPTIONS, stdout); - puts(_( " -v be verbose")); - puts(_( " -E make all warnings errors (non-zero exit status)")); - puts(_( " -b blksize use this blocksize, must equal page size")); - puts(_( " -e edition set edition number (part of fsid)")); - printf(_(" -N endian set cramfs endianness (%s|%s|%s), default %s\n"), "big", "little", "host", "host"); - puts(_( " -i file insert a file image into the filesystem")); - puts(_( " -n name set name of cramfs filesystem")); - printf(_(" -p pad by %d bytes for boot code\n"), PAD_SIZE); - puts(_( " -s sort directory entries (old option, ignored)")); - puts(_( " -z make explicit holes")); - puts(_( " -l[=<mode>] use exclusive device lock (yes, no or nonblock)")); - puts(_( " dirname root of the filesystem to be compressed")); - puts(_( " outfile output file")); + fputsln(_( " -v be verbose"), stdout); + fputsln(_( " -E make all warnings errors (non-zero exit status)"), stdout); + fputsln(_( " -b blksize use this blocksize, must equal page size"), stdout); + fputsln(_( " -e edition set edition number (part of fsid)"), stdout); + fprintf(stdout, _(" -N endian set cramfs endianness (%s|%s|%s), default %s\n"), "big", "little", "host", "host"); + fputsln(_( " -i file insert a file image into the filesystem"), stdout); + fputsln(_( " -n name set name of cramfs filesystem"), stdout); + fprintf(stdout, _(" -p pad by %d bytes for boot code\n"), PAD_SIZE); + fputsln(_( " -s sort directory entries (old option, ignored)"), stdout); + fputsln(_( " -z make explicit holes"), stdout); + fputsln(_( " -l[=<mode>] use exclusive device lock (yes, no or nonblock)"), stdout); + fputsln(_( " dirname root of the filesystem to be compressed"), stdout); + fputsln(_( " outfile output file"), stdout); fputs(USAGE_SEPARATOR, stdout); - printf(USAGE_HELP_OPTIONS(16)); - printf(USAGE_MAN_TAIL("mkfs.cramfs(8)")); + fprintf(stdout, USAGE_HELP_OPTIONS(16)); + fprintf(stdout, USAGE_MAN_TAIL("mkfs.cramfs(8)")); exit(MKFS_EX_OK); } @@ -497,7 +497,7 @@ static unsigned int write_directory_structure(struct entry *entry, char *base, u if (entry->child) { if (stack_entries >= stack_size) { stack_size *= 2; - entry_stack = xrealloc(entry_stack, stack_size * sizeof(struct entry *)); + entry_stack = xreallocarray(entry_stack, stack_size, sizeof(struct entry *)); } entry_stack[stack_entries] = entry; stack_entries++; |