nils/shairport-sync
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Check help and version argument early

Browse Source 
Check for the help and version arguments makes sure that it's
always possible to get the version and usage even if there are
issues in other parts of the code.
This commit is contained in:
Henrik Nilsson
2019-08-01 10:16:37 +02:00
parent 040a5915e3
commit 2e7e5b6856
1 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
shairport.c
+12 -12
View File
@@ -1363,6 +1363,18 @@ void exit_function() {
}
int main(int argc, char **argv) {
/* Check if we are called with -V or --version parameter */
if (argc >= 2 && ((strcmp(argv[1], "-V") == 0) || (strcmp(argv[1], "--version") == 0))) {
print_version();
exit(EXIT_FAILURE);
}
/* Check if we are called with -h or --help parameter */
if (argc >= 2 && ((strcmp(argv[1], "-h") == 0) || (strcmp(argv[1], "--help") == 0))) {
usage(argv[0]);
exit(EXIT_FAILURE);
}
#ifdef CONFIG_LIBDAEMON
pid = getpid();
#endif
@@ -1468,18 +1480,6 @@ int main(int argc, char **argv) {
r64arrayinit();
/* Check if we are called with -V or --version parameter */
if (argc >= 2 && ((strcmp(argv[1], "-V") == 0) || (strcmp(argv[1], "--version") == 0))) {
print_version();
exit(EXIT_FAILURE);
}
/* Check if we are called with -h or --help parameter */
if (argc >= 2 && ((strcmp(argv[1], "-h") == 0) || (strcmp(argv[1], "--help") == 0))) {
usage(argv[0]);
exit(EXIT_FAILURE);
}
#ifdef CONFIG_LIBDAEMON
/* Reset signal handlers */