Skip to content

Fix return code for --help and --version #11

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
rotty wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix return code for --help and --version #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 11 additions & 3 deletions src/common.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,11 @@ int debug = 0;
static int gargc = 0;
static char** gargv = NULL;

int successexit(const char* text) {
printf("%s\n", text);
return 0;
}

int errorexit(const char* text) {
fprintf(stderr, "%s\n", text);
return -1;
Expand Down Expand Up @@ -416,14 +421,17 @@ static char* getconfcmdargs(const char* name) {
return NULL;
}

/* A positive return value indicates the caller to proceed. A zero return value means the
program should terminate sucessfully after option processing, while a negative return
value indicates an error during argument processing. */
int qtprocessargs(int argc, char** argv) {
int i;
for (i = 1; i < argc; i++) {
char* a = argv[i];
if (!strcmp(a, "-h") || !strcmp(a, "--help")) {
return errorexit("Please read the documentation at http://wiki.ucis.nl/QuickTun");
return successexit("Please read the documentation at http://wiki.ucis.nl/QuickTun");
} else if (!strcmp(a, "-v") || !strcmp(a, "--version")) {
return errorexit("UCIS QuickTun "QT_VERSION);
return successexit("UCIS QuickTun "QT_VERSION);
} else if (!strcmp(a, "-c")) {
gargc = argc;
gargv = argv;
Expand All @@ -433,7 +441,7 @@ int qtprocessargs(int argc, char** argv) {
return errorexit("Unexpected command line argument");
}
}
return 0;
return 1;
}
#endif

5 changes: 3 additions & 2 deletions src/run.combined.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,13 +44,14 @@ char* getenvdeb(const char* name) {
#endif

int main(int argc, char** argv) {
print_header();
#ifdef DEBIAN_BINARY
getconf = getenvdeb;
#else
getconf = getenv;
#endif
if (qtprocessargs(argc, argv) < 0) return -1;
int rc = qtprocessargs(argc, argv);
if (rc <= 0) return rc;
print_header();
char* envval;
if ((envval = getconf("PROTOCOL"))) {
if (strcmp(envval, "raw") == 0) {
Expand Down