dany/u-boot-megous
1
0
Fork 0
mirror of https://xff.cz/git/u-boot/ synced 2025-09-01 16:52:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

tools: dumpimage: Add help option and make error paths consistent

Browse Source 
The utility dumpimage has error paths that display the usage and others
that exit without displaying usage. Add an explicit help option to
dumpimage to display the usage and remove it's use in error paths to make
the error messages more obvious and errors paths more consistent.

Signed-off-by: Martyn Welch <martyn.welch@collabora.com>
This commit is contained in:
Martyn Welch
2019-01-26 02:31:53 +00:00
committed by Tom Rini
parent 11e3c1fd3b
commit 65a80b43b3
1 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
tools/dumpimage.c
View File

@@ -65,7 +65,7 @@ int main(int argc, char **argv)
params.cmdname = *argv;
while ((opt = getopt(argc, argv, "lo:T:p:V")) != -1) {
while ((opt = getopt(argc, argv, "hlo:T:p:V")) != -1) {
switch (opt) {
case 'l':
params.lflag = 1;
@@ -79,7 +79,7 @@ int main(int argc, char **argv)
if (params.type < 0) {
fprintf(stderr, "%s: Invalid type\n",
params.cmdname);
usage();
exit(EXIT_FAILURE);
}
break;
case 'p':
@@ -94,15 +94,20 @@ int main(int argc, char **argv)
case 'V':
printf("dumpimage version %s\n", PLAIN_VERSION);
exit(EXIT_SUCCESS);
case 'h':
usage();
default:
usage();
break;
}
}
if (argc < 2)
usage();
if (optind >= argc) {
fprintf(stderr, "%s: image file missing\n", params.cmdname);
usage();
exit(EXIT_FAILURE);
}
params.imagefile = argv[optind];
@@ -123,7 +128,7 @@ int main(int argc, char **argv)
if (tparams->check_params(&params)) {
fprintf(stderr, "%s: Parameter check failed\n",
params.cmdname);
usage();
exit(EXIT_FAILURE);
}
}
@@ -195,9 +200,12 @@ static void usage(void)
" -T ==> set image type to 'type'\n"
" -p ==> 'position' (starting at 0) of the component to extract from image\n",
params.cmdname);
fprintf(stderr,
" %s -h ==> print usage information and exit\n",
params.cmdname);
fprintf(stderr,
" %s -V ==> print version information and exit\n",
params.cmdname);
exit(EXIT_FAILURE);
exit(EXIT_SUCCESS);
}