From 4ee8bfc521a048d8fd318c9c7dbad129b0da87d7 Mon Sep 17 00:00:00 2001 From: Randi Harper Date: Sun, 10 Oct 2010 20:37:38 +0000 Subject: [PATCH] Report subcommand handler errors in mfiutil/mptutil so that tools that invoke the utilities can robustly report errors. Submitted by: gcooper Reviewed by: jhb Approved by: cperciva (mentor) MFC after: 1 week --- usr.sbin/mfiutil/mfiutil.c | 8 +++++--- usr.sbin/mptutil/mptutil.c | 8 +++++--- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/usr.sbin/mfiutil/mfiutil.c b/usr.sbin/mfiutil/mfiutil.c index d091fb63177d..7c0a117ad0a9 100644 --- a/usr.sbin/mfiutil/mfiutil.c +++ b/usr.sbin/mfiutil/mfiutil.c @@ -125,10 +125,12 @@ main(int ac, char **av) SET_FOREACH(cmd, MFI_DATASET(top)) { if (strcmp((*cmd)->name, av[0]) == 0) { - (*cmd)->handler(ac, av); - return (0); + if ((*cmd)->handler(ac, av)) + return (1); + else + return (0); } } warnx("Unknown command %s.", av[0]); - return (0); + return (1); } diff --git a/usr.sbin/mptutil/mptutil.c b/usr.sbin/mptutil/mptutil.c index e7b58060ef1a..63e8efadd4b9 100644 --- a/usr.sbin/mptutil/mptutil.c +++ b/usr.sbin/mptutil/mptutil.c @@ -114,10 +114,12 @@ main(int ac, char **av) SET_FOREACH(cmd, MPT_DATASET(top)) { if (strcmp((*cmd)->name, av[0]) == 0) { - (*cmd)->handler(ac, av); - return (0); + if ((*cmd)->handler(ac, av)) + return (1); + else + return (0); } } warnx("Unknown command %s.", av[0]); - return (0); + return (1); }