[PATCH dockapps 18/28] wmix: changed command line parsing code to report properly incorrect options

[Christophe]

From: Christophe CURIS <christophe.cu...@free.fr>

The original code did not abort when an invalid option was provided
or if there was non-options arguments on the command line.
The new code will report all problems found and stop to have the user
fix his command. It also remove some unnecessary pointer checks.

Signed-off-by: Christophe CURIS <christophe.cu...@free.fr>
---
 wmix/config.c | 38 ++++++++++++++++++++++++++++++--------
 1 file changed, 30 insertions(+), 8 deletions(-)

diff --git a/wmix/config.c b/wmix/config.c
index 42f9e6c..ffd2b60 100644
--- a/wmix/config.c
+++ b/wmix/config.c
@@ -71,13 +71,29 @@ void parse_cli_options(int argc, char **argv)
 {
        int opt;
        int count_exclude = 0;
+       bool error_found;
 
+       opterr = 0;     /* We take charge of printing the error message */
        config.verbose = false;
-       while ((opt = getopt(argc, argv, "d:e:f:hm:v")) != EOF) {
+       error_found = false;
+       for (;;) {
+               opt = getopt(argc, argv, ":d:e:f:hm:v");
+               if (opt == -1)
+                       break;
+
                switch (opt) {
+               case '?':
+                       fprintf(stderr, "wmix:error: unknow option '-%c'\n", 
optopt);
+                       error_found = true;
+                       break;
+
+               case ':':
+                       fprintf(stderr, "wmix:error: missing argument for 
option '-%c'\n", optopt);
+                       error_found = true;
+                       break;
+
                case 'd':
-                       if (optarg != NULL)
-                               config.display_name = strdup(optarg);
+                       config.display_name = strdup(optarg);
                        break;
 
                case 'e':
@@ -89,9 +105,8 @@ void parse_cli_options(int argc, char **argv)
                        break;
 
                case 'f':
-                       if (optarg != NULL)
-                               if (config.file != NULL)
-                                       free(config.file);
+                       if (config.file != NULL)
+                               free(config.file);
                        config.file = strdup(optarg);
                        break;
 
@@ -101,8 +116,7 @@ void parse_cli_options(int argc, char **argv)
                        break;
 
                case 'm':
-                       if (optarg != NULL)
-                               config.mixer_device = strdup(optarg);
+                       config.mixer_device = strdup(optarg);
                        break;
 
                case 'v':
@@ -114,6 +128,14 @@ void parse_cli_options(int argc, char **argv)
                }
        }
        config.exclude_channel[count_exclude] = NULL;
+
+       if (optind < argc) {
+               fprintf(stderr, "wmix:error: argument '%s' not understood\n", 
argv[optind]);
+               error_found = true;
+       }
+
+       if (error_found)
+               exit(EXIT_FAILURE);
 }
 
 /*
-- 
1.9.2


-- 
To unsubscribe, send mail to wmaker-dev-unsubscr...@lists.windowmaker.org.