X-Git-Url: https://git.decadent.org.uk/gitweb/?p=nfs-utils.git;a=blobdiff_plain;f=utils%2Fmount%2Fstropts.c;h=537a924198fb263d353f71af90b59ccd8cb394ea;hp=b2e8d2f351cf9680574f3f24a690927e8341a217;hb=39003947436f6676096e1fec3d3f09c95024d0a6;hpb=83efd7ddb50cac2f0cf4887e7c54991b4cdcc635

diff --git a/utils/mount/stropts.c b/utils/mount/stropts.c
index b2e8d2f..537a924 100644
--- a/utils/mount/stropts.c
+++ b/utils/mount/stropts.c
@@ -305,26 +305,31 @@ static int append_clientaddr_option(struct sockaddr_in *saddr,
 int nfsmount_s(const char *spec, const char *node, int flags,
 		char **extra_opts, int fake, int child)
 {
+	struct mount_options *options = NULL;
 	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;
-
-	extract_interesting_options(*extra_opts);
+		goto out;
 
-	if (!child && addr_opt) {
-		nfs_error(_("%s: Illegal option: 'addr='"), progname);
-		return EX_FAIL;
+	options = po_split(*extra_opts);
+	if (!options) {
+		nfs_error(_("%s: internal option parsing error"), progname);
+		goto out;
 	}
 
-	if (!append_addr_opt(&saddr, extra_opts))
-		return EX_FAIL;
+	if (!append_addr_option(&saddr, options))
+		goto out;
+
+	if (po_join(options, extra_opts) == PO_FAILED) {
+		nfs_error(_("%s: internal option parsing error"), progname);
+		goto out;
+	}
 
 	if (verbose)
 		printf(_("%s: text-based options: '%s'\n"),
@@ -334,11 +339,15 @@ 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:
+	po_destroy(options);
+	return retval;
 }
 
 /*
@@ -358,29 +367,34 @@ int nfsmount_s(const char *spec, const char *node, int flags,
 int nfs4mount_s(const char *spec, const char *node, int flags,
 		char **extra_opts, int fake, int child)
 {
+	struct mount_options *options = NULL;
 	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;
-
-	extract_interesting_options(*extra_opts);
+		goto out;
 
-	if (addr_opt) {
-		nfs_error(_("%s: Illegal option: 'addr='"), progname);
-		return EX_FAIL;
+	options = po_split(*extra_opts);
+	if (!options) {
+		nfs_error(_("%s: internal option parsing error"), progname);
+		goto out;
 	}
 
-	if (!append_addr_opt(&saddr, extra_opts))
-		return EX_FAIL;
+	if (!append_addr_option(&saddr, options))
+		goto out;
+
+	if (!append_clientaddr_option(&saddr, options))
+		goto out;
 
-	if (!ca_opt && !append_clientaddr_opt(&saddr, extra_opts))
-		return EX_FAIL;
+	if (po_join(options, extra_opts) == PO_FAILED) {
+		nfs_error(_("%s: internal option parsing error"), progname);
+		goto out;
+	}
 
 	if (verbose)
 		printf(_("%s: text-based options: '%s'\n"),
@@ -390,9 +404,13 @@ 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:
+	po_destroy(options);
+	return retval;
 }