Merge pull request #1063 from psychon/getopt_errors

Getopt errors
This commit is contained in:
Daniel Hahler 2016-09-02 18:12:49 +02:00 committed by GitHub
commit c2755cbde9
1 changed files with 7 additions and 8 deletions

View File

@ -507,16 +507,12 @@ main(int argc, char **argv)
run_test = true; run_test = true;
break; break;
case 'c': case 'c':
if(a_strlen(optarg)) if (confpath != NULL)
fatal("--config may only be specified once");
confpath = a_strdup(optarg); confpath = a_strdup(optarg);
else
fatal("-c option requires a file name");
break; break;
case 's': case 's':
if(a_strlen(optarg))
string_array_append(&searchpath, a_strdup(optarg)); string_array_append(&searchpath, a_strdup(optarg));
else
fatal("-s option requires a directory name");
break; break;
case 'a': case 'a':
no_argb = true; no_argb = true;
@ -524,6 +520,9 @@ main(int argc, char **argv)
case 'r': case 'r':
replace_wm = true; replace_wm = true;
break; break;
default:
exit_help(EXIT_FAILURE);
break;
} }
/* Get XDG basedir data */ /* Get XDG basedir data */