X-Git-Url: https://git.decadent.org.uk/gitweb/?p=nfs-utils.git;a=blobdiff_plain;f=utils%2Fmount%2Fstropts.c;h=6f57e86ed4633e59f94c4f38903f1b520ce406ad;hp=3d83f9e5743bb9dd2c974ecf1242d7477677bd9f;hb=0e65b81caabbc0029d17a0a5042badb1417b2b4d;hpb=e8232ab2cfd9d5b6669c5ba47d423925bdc25e12

diff --git a/utils/mount/stropts.c b/utils/mount/stropts.c
index 3d83f9e..6f57e86 100644
--- a/utils/mount/stropts.c
+++ b/utils/mount/stropts.c
@@ -215,85 +215,41 @@ static int fix_mounthost_option(struct mount_options *options)
 }
 
 /*
- * nfsmount_s - Mount an NFSv2 or v3 file system using C string options
+ * Set up mandatory mount options.
  *
- * @spec:	C string hostname:path specifying remoteshare to mount
- * @node:	C string pathname of local mounted on directory
- * @flags:	MS_ style flags
- * @extra_opts:	pointer to C string containing fs-specific mount options
- *		(possibly also a return argument)
- * @fake:	flag indicating whether to carry out the whole operation
- * @child:	one if this is a backgrounded mount
- *
- * XXX: need to handle bg, fg, and retry options.
+ * Returns 1 if successful; otherwise zero.
  */
-int nfsmount_s(const char *spec, const char *node, int flags,
-		char **extra_opts, int fake, int child)
+static int set_mandatory_options(const char *type,
+				 struct sockaddr_in *saddr,
+				 struct mount_options *options)
 {
-	struct mount_options *options = NULL;
-	struct sockaddr_in saddr;
-	char *hostname;
-	int err, retval = EX_FAIL;
-
-	if (!parse_devname(spec, &hostname))
-		goto out;
-	err = fill_ipv4_sockaddr(hostname, &saddr);
-	free(hostname);
-	if (!err)
-		goto out;
-
-	options = po_split(*extra_opts);
-	if (!options) {
-		nfs_error(_("%s: internal option parsing error"), progname);
-		goto out;
-	}
-
-	if (!append_addr_option(&saddr, options))
-		goto out;
-
-	if (!fix_mounthost_option(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"),
-			progname, *extra_opts);
+	if (!append_addr_option(saddr, options))
+		return 0;
 
-	if (!fake) {
-		if (mount(spec, node, "nfs",
-				flags & ~(MS_USER|MS_USERS), *extra_opts)) {
-			mount_error(spec, node, errno);
-			goto out;
-		}
+	if (strncmp(type, "nfs4", 4) == 0) {
+		if (!append_clientaddr_option(saddr, options))
+			return 0;
+	} else {
+		if (!fix_mounthost_option(options))
+			return 0;
 	}
 
-	retval = EX_SUCCESS;
-
-out:
-	po_destroy(options);
-	return retval;
+	return 1;
 }
 
-/*
- * nfs4mount_s - Mount an NFSv4 file system using C string options
- *
- * @spec:	C string hostname:path specifying remoteshare to mount
- * @node:	C string pathname of local mounted on directory
- * @flags:	MS_ style flags
+/**
+ * nfsmount_string - Mount an NFS file system using C string options
+ * @spec: C string specifying remote share to mount ("hostname:path")
+ * @node: C string pathname of local mounted-on directory
+ * @type: C string that represents file system type ("nfs" or "nfs4")
+ * @flags: MS_ style mount flags
  * @extra_opts:	pointer to C string containing fs-specific mount options
- *		(possibly also a return argument)
- * @fake:	flag indicating whether to carry out the whole operation
- * @child:	one if this is a backgrounded mount
- *
- * XXX: need to handle bg, fg, and retry options.
- *
+ *		(input and output argument)
+ * @fake: flag indicating whether to carry out the whole operation
+ * @child: one if this is a mount daemon (bg)
  */
-int nfs4mount_s(const char *spec, const char *node, int flags,
-		char **extra_opts, int fake, int child)
+int nfsmount_string(const char *spec, const char *node, const char *type,
+		    int flags, char **extra_opts, int fake, int child)
 {
 	struct mount_options *options = NULL;
 	struct sockaddr_in saddr;
@@ -313,10 +269,7 @@ int nfs4mount_s(const char *spec, const char *node, int flags,
 		goto out;
 	}
 
-	if (!append_addr_option(&saddr, options))
-		goto out;
-
-	if (!append_clientaddr_option(&saddr, options))
+	if (!set_mandatory_options(type, &saddr, options))
 		goto out;
 
 	if (po_join(options, extra_opts) == PO_FAILED) {
@@ -329,7 +282,7 @@ int nfs4mount_s(const char *spec, const char *node, int flags,
 			progname, *extra_opts);
 
 	if (!fake) {
-		if (mount(spec, node, "nfs4",
+		if (mount(spec, node, type,
 				flags & ~(MS_USER|MS_USERS), *extra_opts)) {
 			mount_error(spec, node, errno);
 			goto out;