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

Merge pull request #887 from henriknil/early_version_usage

Browse Source 
Return EXIT_WITH_SUCCESS on early exit on version (`–version` or `-V`)  and help (`–help` or `-h`) arguments.
This commit is contained in:
Mike Brady
2019-08-28 08:55:14 +01:00
committed by GitHub
parent 040a5915e3 14de9e27ab
commit 7f2b437318
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_SUCCESS);
}
/* 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_SUCCESS);
}
#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 */