From e36fa3a1c19fec32987fc07dddd0f96d66fb3db6 Mon Sep 17 00:00:00 2001 From: "David M. Syzdek" Date: Mon, 28 Mar 2022 15:24:24 -0800 Subject: tinyrad: fixing --help and --version --- src/tru/tinyradutil.c | 2 +- src/tru/widget-config.c | 4 +--- src/tru/widget-dict.c | 4 +--- src/tru/widget-url.c | 4 +--- 4 files changed, 4 insertions(+), 10 deletions(-) diff --git a/src/tru/tinyradutil.c b/src/tru/tinyradutil.c index 5acfd7b..99c6def 100644 --- a/src/tru/tinyradutil.c +++ b/src/tru/tinyradutil.c @@ -186,7 +186,7 @@ int main(int argc, char * argv[]) if ((rc = tru_cli_parse(cnf, argc, argv, short_opt, long_opt, &tru_usage)) != 0) { tru_cleanup(cnf); - return((rc == 0) ? 0 : 1); + return((rc == TRU_GETOPT_EXIT) ? 0 : 1); }; if ((argc - optind) < 1) { diff --git a/src/tru/widget-config.c b/src/tru/widget-config.c index a90dc1d..cf52aec 100644 --- a/src/tru/widget-config.c +++ b/src/tru/widget-config.c @@ -63,9 +63,7 @@ tru_widget_config( // process widget cli options if ((rc = tru_cli_parse(cnf, cnf->argc, cnf->argv, short_opt, long_opt, &tru_usage)) != 0) - { - return((rc == 0) ? 0 : 1); - }; + return((rc == TRU_GETOPT_EXIT) ? 0 : 1); if (optind < cnf->argc) { fprintf(stderr, "%s: unrecognized argument `-- %s'\n", PROGRAM_NAME, cnf->argv[optind+1]); diff --git a/src/tru/widget-dict.c b/src/tru/widget-dict.c index 8bf52ac..ac297d1 100644 --- a/src/tru/widget-dict.c +++ b/src/tru/widget-dict.c @@ -63,9 +63,7 @@ tru_widget_dict( // process widget cli options if ((rc = tru_cli_parse(cnf, cnf->argc, cnf->argv, short_opt, long_opt, &tru_usage)) != 0) - { - return((rc == 0) ? 0 : 1); - }; + return((rc == TRU_GETOPT_EXIT) ? 0 : 1); if (optind < cnf->argc) { fprintf(stderr, "%s: unrecognized argument `-- %s'\n", PROGRAM_NAME, cnf->argv[optind+1]); diff --git a/src/tru/widget-url.c b/src/tru/widget-url.c index ce14a20..18d8137 100644 --- a/src/tru/widget-url.c +++ b/src/tru/widget-url.c @@ -98,9 +98,7 @@ tru_widget_url( // process widget cli options if ((rc = tru_cli_parse(cnf, cnf->argc, cnf->argv, short_opt, long_opt, &tru_widget_url_usage)) != 0) - { - return((rc == 0) ? 0 : 1); - }; + return((rc == TRU_GETOPT_EXIT) ? 0 : 1); if (optind >= cnf->argc) { fprintf(stderr, "%s: missing required argument\n", PROGRAM_NAME); -- cgit v1.2.3