kgess-mirror/freebsd-src
1
0
Fork 0
mirror of https://git.freebsd.org/src.git synced 2026-01-11 19:57:22 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

mkimg: Add a -h option and improve usage output to be more expressive

Browse source 
Reviewed by:	imp, kp
MFC after:	3 days
Differential Revision:	https://reviews.freebsd.org/D52906
This commit is contained in:
Brad Davis 2025-10-03 15:57:06 -06:00
parent 4ee348e271
commit 6fa18fe744
1 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
usr.bin/mkimg/mkimg.c
View file

@ -142,8 +142,10 @@ static void
usage(const char *why)
{
warnx("error: %s", why);
fputc('\n', stderr);
if (why != NULL) {
warnx("error: %s", why);
fputc('\n', stderr);
}
fprintf(stderr, "usage: %s <options>\n", getprogname());
fprintf(stderr, " options:\n");
@ -171,19 +173,19 @@ usage(const char *why)
print_schemes(1);
fputc('\n', stderr);
fprintf(stderr, " partition specification:\n");
fprintf(stderr, "\t<t>[/<l>]::<size>[:[+]<offset>]\t- "
fprintf(stderr, "\t<type>[/<label>]::<size>[:[+]<offset>]\t- "
"empty partition of given size and\n\t\t\t\t\t"
" optional relative or absolute offset\n");
fprintf(stderr, "\t<t>[/<l>]:=<file>[:[+]offset]\t- partition "
fprintf(stderr, "\t<type>[/<label>]:=<file>[:[+]offset]\t- partition "
"content and size are\n\t\t\t\t\t"
" determined by the named file and\n"
"\t\t\t\t\t optional relative or absolute offset\n");
fprintf(stderr, "\t<t>[/<l>]:-<cmd>\t\t- partition content and size "
fprintf(stderr, "\t<type>[/<label>]:-<cmd>\t\t- partition content and size "
"are taken\n\t\t\t\t\t from the output of the command to run\n");
fprintf(stderr, "\t-\t\t\t\t- unused partition entry\n");
fprintf(stderr, "\t where:\n");
fprintf(stderr, "\t\t<t>\t- scheme neutral partition type\n");
fprintf(stderr, "\t\t<l>\t- optional scheme-dependent partition "
fprintf(stderr, "\t\t<type>\t- scheme neutral partition type\n");
fprintf(stderr, "\t\t<label>\t- optional scheme-dependent partition "
"label\n");
exit(EX_USAGE);
@ -564,7 +566,7 @@ main(int argc, char *argv[])
bcfd = -1;
outfd = 1; /* Write to stdout by default */
while ((c = getopt_long(argc, argv, "a:b:c:C:f:o:p:s:t:vyH:P:S:T:",
while ((c = getopt_long(argc, argv, "a:b:c:C:f:ho:p:s:t:vyH:P:S:T:",
longopts, NULL)) != -1) {
switch (c) {
case 'a': /* ACTIVE PARTITION, if supported */
@ -596,6 +598,9 @@ main(int argc, char *argv[])
if (error)
errc(EX_DATAERR, error, "format");
break;
case 'h': /* HELP */
usage(NULL);
break;
case 'o': /* OUTPUT FILE */
if (outfd != 1)
usage("multiple output files given");