From aed4aa1335326f4327bf9799ef63d2f05cfe5e36 Mon Sep 17 00:00:00 2001 From: Chuck Lever Date: Fri, 28 Sep 2007 16:36:45 -0400 Subject: [PATCH] text-based mount.nfs: prepare for more complex error exit handling I'm about to add an object or two that needs to be freed before the main functions exit. Prepare the logic by adding an 'out' label and some goto's. Signed-off-by: Chuck Lever Signed-off-by: Neil Brown --- utils/mount/stropts.c | 36 +++++++++++++++++++++--------------- 1 file changed, 21 insertions(+), 15 deletions(-) diff --git a/utils/mount/stropts.c b/utils/mount/stropts.c index b2e8d2f..4dbd19e 100644 --- a/utils/mount/stropts.c +++ b/utils/mount/stropts.c @@ -307,24 +307,24 @@ int nfsmount_s(const char *spec, const char *node, int flags, { struct sockaddr_in saddr; char *hostname; - int err; + int err, retval = EX_FAIL; if (!parse_devname(spec, &hostname)) - return EX_FAIL; + goto out; err = fill_ipv4_sockaddr(hostname, &saddr); free(hostname); if (!err) - return EX_FAIL; + goto out; extract_interesting_options(*extra_opts); if (!child && addr_opt) { nfs_error(_("%s: Illegal option: 'addr='"), progname); - return EX_FAIL; + goto out; } if (!append_addr_opt(&saddr, extra_opts)) - return EX_FAIL; + goto out; if (verbose) printf(_("%s: text-based options: '%s'\n"), @@ -334,11 +334,14 @@ int nfsmount_s(const char *spec, const char *node, int flags, if (mount(spec, node, "nfs", flags & ~(MS_USER|MS_USERS), *extra_opts)) { mount_error(spec, node, errno); - return EX_FAIL; + goto out; } } - return EX_SUCCESS; + retval = EX_SUCCESS; + +out: + return retval; } /* @@ -360,27 +363,27 @@ int nfs4mount_s(const char *spec, const char *node, int flags, { struct sockaddr_in saddr; char *hostname; - int err; + int err, retval = EX_FAIL; if (!parse_devname(spec, &hostname)) - return EX_FAIL; + goto out; err = fill_ipv4_sockaddr(hostname, &saddr); free(hostname); if (!err) - return EX_FAIL; + goto out; extract_interesting_options(*extra_opts); if (addr_opt) { nfs_error(_("%s: Illegal option: 'addr='"), progname); - return EX_FAIL; + goto out; } if (!append_addr_opt(&saddr, extra_opts)) - return EX_FAIL; + goto out; if (!ca_opt && !append_clientaddr_opt(&saddr, extra_opts)) - return EX_FAIL; + goto out; if (verbose) printf(_("%s: text-based options: '%s'\n"), @@ -390,9 +393,12 @@ int nfs4mount_s(const char *spec, const char *node, int flags, if (mount(spec, node, "nfs4", flags & ~(MS_USER|MS_USERS), *extra_opts)) { mount_error(spec, node, errno); - return EX_FAIL; + goto out; } } - return EX_SUCCESS; + retval = EX_SUCCESS; + +out: + return retval; } -- 2.39.5