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>

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)
                                 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);
                 }
         }