Date: Sun, 10 Oct 2010 20:37:38 +0000 (UTC) From: Randi Harper <randi@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r213672 - in head/usr.sbin: mfiutil mptutil Message-ID: <201010102037.o9AKbcFG092501@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: randi Date: Sun Oct 10 20:37:38 2010 New Revision: 213672 URL: http://svn.freebsd.org/changeset/base/213672 Log: 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 Modified: head/usr.sbin/mfiutil/mfiutil.c head/usr.sbin/mptutil/mptutil.c Modified: head/usr.sbin/mfiutil/mfiutil.c ============================================================================== --- head/usr.sbin/mfiutil/mfiutil.c Sun Oct 10 12:21:35 2010 (r213671) +++ head/usr.sbin/mfiutil/mfiutil.c Sun Oct 10 20:37:38 2010 (r213672) @@ -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); } Modified: head/usr.sbin/mptutil/mptutil.c ============================================================================== --- head/usr.sbin/mptutil/mptutil.c Sun Oct 10 12:21:35 2010 (r213671) +++ head/usr.sbin/mptutil/mptutil.c Sun Oct 10 20:37:38 2010 (r213672) @@ -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); }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201010102037.o9AKbcFG092501>