summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/makedevs
diff options
context:
space:
mode:
authorRoy Li <rongqing.li@windriver.com>2013-09-25 05:58:36 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-09-30 22:11:57 +0100
commit4312f5a534bb4029341c076f25ac5be2de69b37f (patch)
treedd7bfa3889882708a39f9dc3832ba2aa6da02573 /meta/recipes-devtools/makedevs
parent66bf6562d22b9217f1047ead3319f0faa91c2d90 (diff)
downloadpoky-4312f5a534bb4029341c076f25ac5be2de69b37f.tar.gz
makedevs: rectify the exit codes and handle the invalid parameter
It is correct behaviours to output help and version information, and should return 0; When input parameter is invalid, print help information and exit. (From OE-Core rev: 7c61daa08fa51557e0e6785e738646cb5d8de91b) Signed-off-by: Roy Li <rongqing.li@windriver.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/makedevs')
-rw-r--r--meta/recipes-devtools/makedevs/makedevs-1.0.0/makedevs.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/meta/recipes-devtools/makedevs/makedevs-1.0.0/makedevs.c b/meta/recipes-devtools/makedevs/makedevs-1.0.0/makedevs.c
index cc3707b2c8..5d2c45b310 100644
--- a/meta/recipes-devtools/makedevs/makedevs-1.0.0/makedevs.c
+++ b/meta/recipes-devtools/makedevs/makedevs-1.0.0/makedevs.c
@@ -465,8 +465,8 @@ int main(int argc, char **argv)
465 error_msg_and_die("%s: not a proper device table file", optarg); 465 error_msg_and_die("%s: not a proper device table file", optarg);
466 break; 466 break;
467 case 'h': 467 case 'h':
468 fprintf(stderr, helptext); 468 printf(helptext);
469 exit(1); 469 exit(0);
470 case 'r': 470 case 'r':
471 case 'd': /* for compatibility with mkfs.jffs, genext2fs, etc... */ 471 case 'd': /* for compatibility with mkfs.jffs, genext2fs, etc... */
472 if (rootdir != default_rootdir) { 472 if (rootdir != default_rootdir) {
@@ -476,8 +476,11 @@ int main(int argc, char **argv)
476 break; 476 break;
477 477
478 case 'v': 478 case 'v':
479 fprintf(stderr, "makedevs revision %.*s\n", 479 printf("makedevs revision %.*s\n",
480 (int) strlen(revtext) - 13, revtext + 11); 480 (int) strlen(revtext) - 13, revtext + 11);
481 exit(0);
482 default:
483 fprintf(stderr, helptext);
481 exit(1); 484 exit(1);
482 } 485 }
483 } 486 }