ubi-utils: send help/version info to stdout

Usage/version information should go to stdout when it is expected behavior
(i.e. the user requested it explicitly).  This info should go to stderr
only when the usage info is being shown as a result of incorrect options.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>

diff --git a/ubi-utils/src/mtdinfo.c b/ubi-utils/src/mtdinfo.c
index 820c16d19b677439311d808e591a1105b70c97c8..666d73955172b2d6f3d49d0a85f00bdb91127dd7 100644 (file)
--- a/ubi-utils/src/mtdinfo.c
+++ b/ubi-utils/src/mtdinfo.c
@@ -111,13 +111,13 @@ static int parse_opt(int argc, char * const argv[])
                        break;
 
                case 'h':
-                       fprintf(stderr, "%s\n\n", doc);
-                       fprintf(stderr, "%s\n\n", usage);
-                       fprintf(stderr, "%s\n", optionsstr);
+                       printf("%s\n\n", doc);
+                       printf("%s\n\n", usage);
+                       printf("%s\n", optionsstr);
                        exit(EXIT_SUCCESS);
 
                case 'V':
-                       fprintf(stderr, "%s\n", PROGRAM_VERSION);
+                       printf("%s\n", PROGRAM_VERSION);
                        exit(EXIT_SUCCESS);
 
                case ':':

diff --git a/ubi-utils/src/ubiattach.c b/ubi-utils/src/ubiattach.c
index 9297b56d2f28b5cef8cd3d94c191e926553128ce..4f18e9918da80bf6536d97e3e44f792c677d8dd1 100644 (file)
--- a/ubi-utils/src/ubiattach.c
+++ b/ubi-utils/src/ubiattach.c
@@ -123,9 +123,9 @@ static int parse_opt(int argc, char * const argv[])
                        break;
 
                case 'h':
-                       fprintf(stderr, "%s\n\n", doc);
-                       fprintf(stderr, "%s\n\n", usage);
-                       fprintf(stderr, "%s\n", optionsstr);
+                       printf("%s\n\n", doc);
+                       printf("%s\n\n", usage);
+                       printf("%s\n", optionsstr);
                        exit(EXIT_SUCCESS);
 
                case 'V':

diff --git a/ubi-utils/src/ubicrc32.c b/ubi-utils/src/ubicrc32.c
index a09f053a428ed7e846e19dd4b496dc160c95a525..73ec59537e4e412e29076258eb8812eb14b81daf 100644 (file)
--- a/ubi-utils/src/ubicrc32.c
+++ b/ubi-utils/src/ubicrc32.c
@@ -64,9 +64,9 @@ static int parse_opt(int argc, char * const argv[])
 
                switch (key) {
                case 'h':
-                       fprintf(stderr, "%s\n\n", doc);
-                       fprintf(stderr, "%s\n\n", usage);
-                       fprintf(stderr, "%s\n", optionsstr);
+                       printf("%s\n\n", doc);
+                       printf("%s\n\n", usage);
+                       printf("%s\n", optionsstr);
                        exit(EXIT_SUCCESS);
 
                case 'V':

diff --git a/ubi-utils/src/ubidetach.c b/ubi-utils/src/ubidetach.c
index 5ee55f1367fcaf58ab2d05eec7a28a2bebe3b0b7..668f1bd6d60f8880dba17f40a72f1230b48919d4 100644 (file)
--- a/ubi-utils/src/ubidetach.c
+++ b/ubi-utils/src/ubidetach.c
@@ -107,9 +107,9 @@ static int parse_opt(int argc, char * const argv[])
                        break;
 
                case 'h':
-                       fprintf(stderr, "%s\n\n", doc);
-                       fprintf(stderr, "%s\n\n", usage);
-                       fprintf(stderr, "%s\n", optionsstr);
+                       printf("%s\n\n", doc);
+                       printf("%s\n\n", usage);
+                       printf("%s\n", optionsstr);
                        exit(EXIT_SUCCESS);
 
                case 'V':

diff --git a/ubi-utils/src/ubiformat.c b/ubi-utils/src/ubiformat.c
index 6e5cdb8cfc1981e8868a95e45c8f382f8c2aa8cb..c4b944a2ff758af2f897a30baaf3b36425fb13ae 100644 (file)
--- a/ubi-utils/src/ubiformat.c
+++ b/ubi-utils/src/ubiformat.c
@@ -211,9 +211,9 @@ static int parse_opt(int argc, char * const argv[])
 
                case 'h':
                case '?':
-                       fprintf(stderr, "%s\n\n", doc);
-                       fprintf(stderr, "%s\n\n", usage);
-                       fprintf(stderr, "%s\n", optionsstr);
+                       printf("%s\n\n", doc);
+                       printf("%s\n\n", usage);
+                       printf("%s\n", optionsstr);
                        exit(EXIT_SUCCESS);
 
                case ':':

diff --git a/ubi-utils/src/ubimkvol.c b/ubi-utils/src/ubimkvol.c
index 935f0682e66f70ae87c0884c8be12fa175a5b4e1..25065e32d50d888be2bdccc211367ff51e6e2ebd 100644 (file)
--- a/ubi-utils/src/ubimkvol.c
+++ b/ubi-utils/src/ubimkvol.c
@@ -167,9 +167,9 @@ static int parse_opt(int argc, char * const argv[])
 
                case 'h':
                case '?':
-                       fprintf(stderr, "%s\n\n", doc);
-                       fprintf(stderr, "%s\n\n", usage);
-                       fprintf(stderr, "%s\n", optionsstr);
+                       printf("%s\n\n", doc);
+                       printf("%s\n\n", usage);
+                       printf("%s\n", optionsstr);
                        exit(EXIT_SUCCESS);
 
                case 'V':

diff --git a/ubi-utils/src/ubinfo.c b/ubi-utils/src/ubinfo.c
index 2bfee16c7ef8bd1bff151570ee0422a0d3d6a773..8e14e6e7a88626eef76e9fc6df105a9dbe341b33 100644 (file)
--- a/ubi-utils/src/ubinfo.c
+++ b/ubi-utils/src/ubinfo.c
@@ -118,9 +118,9 @@ static int parse_opt(int argc, char * const argv[])
                        break;
 
                case 'h':
-                       fprintf(stderr, "%s\n\n", doc);
-                       fprintf(stderr, "%s\n\n", usage);
-                       fprintf(stderr, "%s\n", optionsstr);
+                       printf("%s\n\n", doc);
+                       printf("%s\n\n", usage);
+                       printf("%s\n", optionsstr);
                        exit(EXIT_SUCCESS);
 
                case 'V':

diff --git a/ubi-utils/src/ubinize.c b/ubi-utils/src/ubinize.c
index 52a193f0d512413b1f997805e5bf1fe301e797e6..3085b66e6aa3b2f3719ab69eb2ab3ba018de9666 100644 (file)
--- a/ubi-utils/src/ubinize.c
+++ b/ubi-utils/src/ubinize.c
@@ -227,10 +227,10 @@ static int parse_opt(int argc, char * const argv[])
                        break;
 
                case 'h':
-                       ubiutils_print_text(stderr, doc, 80);
-                       fprintf(stderr, "\n%s\n\n", ini_doc);
-                       fprintf(stderr, "%s\n", usage);
-                       fprintf(stderr, "%s\n", optionsstr);
+                       ubiutils_print_text(stdout, doc, 80);
+                       printf("\n%s\n\n", ini_doc);
+                       printf("%s\n\n", usage);
+                       printf("%s\n", optionsstr);
                        exit(EXIT_SUCCESS);
 
                case 'V':

diff --git a/ubi-utils/src/ubirmvol.c b/ubi-utils/src/ubirmvol.c
index 5a7217a4e511e65a70c5137514504c729ae018b1..5725d90a904c7481d99140dba2eccb9183e8e007 100644 (file)
--- a/ubi-utils/src/ubirmvol.c
+++ b/ubi-utils/src/ubirmvol.c
@@ -111,9 +111,9 @@ static int parse_opt(int argc, char * const argv[])
 
                case 'h':
                case '?':
-                       fprintf(stderr, "%s\n\n", doc);
-                       fprintf(stderr, "%s\n\n", usage);
-                       fprintf(stderr, "%s\n", optionsstr);
+                       printf("%s\n\n", doc);
+                       printf("%s\n\n", usage);
+                       printf("%s\n", optionsstr);
                        exit(EXIT_SUCCESS);
 
                case 'V':

diff --git a/ubi-utils/src/ubirsvol.c b/ubi-utils/src/ubirsvol.c
index 34321b8ec0afe0bd096b9991d59fa04936caa693..65f579c0871efd8e234e685392e02bd2ec343942 100644 (file)
--- a/ubi-utils/src/ubirsvol.c
+++ b/ubi-utils/src/ubirsvol.c
@@ -140,9 +140,9 @@ static int parse_opt(int argc, char * const argv[])
 
                case 'h':
                case '?':
-                       fprintf(stderr, "%s\n\n", doc);
-                       fprintf(stderr, "%s\n\n", usage);
-                       fprintf(stderr, "%s\n", optionsstr);
+                       printf("%s\n\n", doc);
+                       printf("%s\n\n", usage);
+                       printf("%s\n", optionsstr);
                        exit(EXIT_SUCCESS);
 
                case 'V':

diff --git a/ubi-utils/src/ubiupdatevol.c b/ubi-utils/src/ubiupdatevol.c
index 62f140b992c443de6aeb7ffb05a665791a1a10b7..24f38fef39ee128bc91b9429fc2f16371d7a5864 100644 (file)
--- a/ubi-utils/src/ubiupdatevol.c
+++ b/ubi-utils/src/ubiupdatevol.c
@@ -97,9 +97,9 @@ static int parse_opt(int argc, char * const argv[])
 
                case 'h':
                case '?':
-                       fprintf(stderr, "%s\n\n", doc);
-                       fprintf(stderr, "%s\n\n", usage);
-                       fprintf(stderr, "%s\n", optionsstr);
+                       printf("%s\n\n", doc);
+                       printf("%s\n\n", usage);
+                       printf("%s\n", optionsstr);
                        exit(EXIT_SUCCESS);
 
                case 'V':