snow/dockapps
1
0
Fork 0
Code Issues Releases Activity

wmix: changed command line parsing code to report properly incorrect options

Browse source 
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.curis@free.fr>
This commit is contained in:
Christophe CURIS 2014-06-07 21:21:49 +02:00 committed by Carlos R. Mafra
parent 676fc13cb2
commit 5b46b380e6
1 changed files with 30 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
wmix/config.c
View file

@ -71,13 +71,29 @@ void parse_cli_options(int argc, char **argv)
{ {
int opt; int opt;
int count_exclude = 0; int count_exclude = 0;
bool error_found;
opterr = 0; /* We take charge of printing the error message */
config.verbose = false; 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) { 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': case 'd':
if (optarg != NULL) config.display_name = strdup(optarg);
config.display_name = strdup(optarg);
break; break;
case 'e': case 'e':
@ -89,9 +105,8 @@ void parse_cli_options(int argc, char **argv)
break; break;
case 'f': case 'f':
if (optarg != NULL) if (config.file != NULL)
if (config.file != NULL) free(config.file);
free(config.file);
config.file = strdup(optarg); config.file = strdup(optarg);
break; break;
@ -101,8 +116,7 @@ void parse_cli_options(int argc, char **argv)
break; break;
case 'm': case 'm':
if (optarg != NULL) config.mixer_device = strdup(optarg);
config.mixer_device = strdup(optarg);
break; break;
case 'v': case 'v':
@ -114,6 +128,14 @@ void parse_cli_options(int argc, char **argv)
} }
} }
config.exclude_channel[count_exclude] = NULL; 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);
} }
/* /*