[oe-commits] Roy Li : makedevs: rectify the exit codes and handle the invalid parameter
git at git.openembedded.org
git at git.openembedded.org
Wed Oct 2 21:40:54 UTC 2013
Module: openembedded-core.git
Branch: dora
Commit: 7c61daa08fa51557e0e6785e738646cb5d8de91b
URL: http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=7c61daa08fa51557e0e6785e738646cb5d8de91b
Author: Roy Li <rongqing.li at windriver.com>
Date: Wed Sep 25 05:58:36 2013 +0000
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.
Signed-off-by: Roy Li <rongqing.li at windriver.com>
Signed-off-by: Saul Wold <sgw at linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
.../makedevs/makedevs-1.0.0/makedevs.c | 9 ++++++---
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 cc3707b..5d2c45b 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)
error_msg_and_die("%s: not a proper device table file", optarg);
break;
case 'h':
- fprintf(stderr, helptext);
- exit(1);
+ printf(helptext);
+ exit(0);
case 'r':
case 'd': /* for compatibility with mkfs.jffs, genext2fs, etc... */
if (rootdir != default_rootdir) {
@@ -476,8 +476,11 @@ int main(int argc, char **argv)
break;
case 'v':
- fprintf(stderr, "makedevs revision %.*s\n",
+ printf("makedevs revision %.*s\n",
(int) strlen(revtext) - 13, revtext + 11);
+ exit(0);
+ default:
+ fprintf(stderr, helptext);
exit(1);
}
}
More information about the Openembedded-commits
mailing list