makedevs: rectify the exit codes and handle the invalid parameter
authorRoy Li <rongqing.li@windriver.com>
Wed, 25 Sep 2013 05:58:36 +0000 (05:58 +0000)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Mon, 30 Sep 2013 21:11:57 +0000 (22:11 +0100)
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>
meta/recipes-devtools/makedevs/makedevs-1.0.0/makedevs.c

index cc3707b..5d2c45b 100644 (file)
@@ -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);
                }
        }