From da185b214bf40ec56c5e0afee7c6b8489579aa2f Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Wed, 29 May 2019 10:40:05 -0700 Subject: [PATCH] scoutfs: return non-zero status on error The error return conventions were confused, resulting in main exiting with success when command execution failed. Signed-off-by: Zach Brown --- utils/src/cmd.c | 3 ++- utils/src/cmd.h | 2 +- utils/src/main.c | 8 +------- 3 files changed, 4 insertions(+), 9 deletions(-) diff --git a/utils/src/cmd.c b/utils/src/cmd.c index 92e799e5..607f12ec 100644 --- a/utils/src/cmd.c +++ b/utils/src/cmd.c @@ -60,7 +60,8 @@ static void usage(void) } } -int cmd_execute(int argc, char **argv) +/* this returns a positive unix return code on error for some reason */ +char cmd_execute(int argc, char **argv) { struct command *com = NULL; int ret; diff --git a/utils/src/cmd.h b/utils/src/cmd.h index 53515b36..084590e9 100644 --- a/utils/src/cmd.h +++ b/utils/src/cmd.h @@ -4,6 +4,6 @@ void cmd_register(char *name, char *opts, char *summary, int (*func)(int argc, char **argv)); -int cmd_execute(int argc, char **argv); +char cmd_execute(int argc, char **argv); #endif diff --git a/utils/src/main.c b/utils/src/main.c index 599babb0..369b4ece 100644 --- a/utils/src/main.c +++ b/utils/src/main.c @@ -10,15 +10,9 @@ int main(int argc, char **argv) { - int ret; - /* * XXX parse global options, env, configs, etc. */ - ret = cmd_execute(argc, argv); - if (ret < 0) - return 1; - - return 0; + return cmd_execute(argc, argv); }