From 729adb4261e93293b5c6a1da1d3c0797e0e36f34 Mon Sep 17 00:00:00 2001 From: Fabian Koller Date: Sat, 7 Nov 2020 06:57:26 +0100 Subject: [PATCH] Change returncodes of jackd on success `--help` and `--version` do not result in server failures. Instead of returning the default `-1`, return a more reasonable `0`. --- common/Jackdmp.cpp | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/common/Jackdmp.cpp b/common/Jackdmp.cpp index 0bc5cea9..35578082 100644 --- a/common/Jackdmp.cpp +++ b/common/Jackdmp.cpp @@ -253,8 +253,6 @@ void print_version() printf( "jackdmp version " VERSION " tmpdir " jack_server_dir " protocol %d" "\n", JACK_PROTOCOL_VERSION); - exit(-1); - } int main(int argc, char** argv) @@ -269,6 +267,7 @@ int main(int argc, char** argv) for(int a = 1; a < argc; ++a) { if( !strcmp(argv[a], "--version") || !strcmp(argv[a], "-V") ) { print_version(); + return 0; } } const char *options = "-d:X:I:P:uvshrRL:STFl:t:mn:p:C:" @@ -495,11 +494,13 @@ int main(int argc, char** argv) } break; + case 'h': + usage(stdout, server_ctl); + return_value = 0; + goto destroy_server; + default: fprintf(stderr, "unknown option character %c\n", optopt); - /*fallthru*/ - - case 'h': usage(stdout, server_ctl); goto destroy_server; }