X-Git-Url: https://git.decadent.org.uk/gitweb/?p=nfs-utils.git;a=blobdiff_plain;f=utils%2Fmount%2Fstropts.c;h=e3a3ac941d322c55950f7347a0b3f26154d71941;hp=4dbd19e0b1ff023967cdca5131200bbb9248e9e3;hb=8034455d1fc4e315b54d100fd8138ce4c5c08471;hpb=aed4aa1335326f4327bf9799ef63d2f05cfe5e36

diff --git a/utils/mount/stropts.c b/utils/mount/stropts.c
index 4dbd19e..e3a3ac9 100644
--- a/utils/mount/stropts.c
+++ b/utils/mount/stropts.c
@@ -65,11 +65,6 @@ extern int nfs_mount_data_version;
 extern char *progname;
 extern int verbose;
 
-static int retry_opt = 10000;		/* 10,000 minutes ~= 1 week */
-static int bg_opt = 0;
-static int addr_opt = 0;
-static int ca_opt = 0;
-
 static int parse_devname(const char *spec, char **hostname)
 {
 	int ret = 0;
@@ -141,100 +136,6 @@ static int fill_ipv4_sockaddr(const char *hostname, struct sockaddr_in *addr)
 	return 1;
 }
 
-/*
- * Walk through our mount options string, and indicate the presence
- * of 'bg', 'retry=', 'addr=', and 'clientaddr='.
- */
-static void extract_interesting_options(char *opts)
-{
-	char *opt, *opteq;
-	int val;
-
-	opts = xstrdup(opts);
-
-	for (opt = strtok(opts, ","); opt; opt = strtok(NULL, ",")) {
-		if ((opteq = strchr(opt, '='))) {
-			val = atoi(opteq + 1);
-			*opteq = '\0';
-			if (strcmp(opt, "bg") == 0)
-				bg_opt++;
-			else if (strcmp(opt, "retry") == 0)
-				retry_opt = val;
-			else if (strcmp(opt, "addr") == 0)
-				addr_opt++;
-			else if (strcmp(opt, "clientaddr") == 0)
-				ca_opt++;
-		} else {
-			if (strcmp(opt, "bg") == 0)
-				bg_opt++;
-		}
-	}
-
-	free(opts);
-}
-
-/*
- * Append the 'addr=' option to the options string.  The server
- * address is added to /etc/mtab for use when unmounting.
- *
- * Returns 1 if 'addr=' option created successfully;
- * otherwise zero.
- */
-static int append_addr_opt(struct sockaddr_in *saddr, char **extra_opts)
-{
-	static char new_opts[1024];
-	char *s, *old_opts;
-
-	s = inet_ntoa(saddr->sin_addr);
-	old_opts = *extra_opts;
-	if (!old_opts)
-		old_opts = "";
-	if (strlen(old_opts) + strlen(s) + 10 >= sizeof(new_opts)) {
-		nfs_error(_("%s: too many mount options\n"),
-				progname);
-		return 0;
-	}
-	snprintf(new_opts, sizeof(new_opts), "%s%saddr=%s",
-		 old_opts, *old_opts ? "," : "", s);
-	*extra_opts = xstrdup(new_opts);
-
-	return 1;
-}
-
-/*
- * Called if no 'clientaddr=' option was specified in the options string
- * to discover our address and append an appropriate 'clientaddr=' option
- * to the options string.
- *
- * Returns 1 if 'clientaddr=' option created successfully;
- * otherwise zero.
- */
-static int append_clientaddr_opt(struct sockaddr_in *saddr, char **extra_opts)
-{
-	static char new_opts[2048], cbuf[256];
-	struct sockaddr_in my_addr;
-
-	if (!get_client_address(saddr, &my_addr))
-		return 0;
-
-	if (strlen(*extra_opts) + 30 >= sizeof(new_opts)) {
-		nfs_error(_("%s: too many mount options"),
-				progname);
-		return 0;
-	}
-
-	strcat(new_opts, *extra_opts);
-
-	snprintf(cbuf, sizeof(cbuf) - 1, "%sclientaddr=%s",
-			*extra_opts ? "," : "", inet_ntoa(my_addr.sin_addr));
-
-	strcat(new_opts, cbuf);
-
-	*extra_opts = xstrdup(new_opts);
-
-	return 1;
-}
-
 /*
  * Append the 'addr=' option to the options string to pass a resolved
  * server address to the kernel.  After a successful mount, this address
@@ -305,6 +206,7 @@ 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, retval = EX_FAIL;
@@ -316,15 +218,19 @@ int nfsmount_s(const char *spec, const char *node, int flags,
 	if (!err)
 		goto out;
 
-	extract_interesting_options(*extra_opts);
-
-	if (!child && addr_opt) {
-		nfs_error(_("%s: Illegal option: 'addr='"), progname);
+	options = po_split(*extra_opts);
+	if (!options) {
+		nfs_error(_("%s: internal option parsing error"), progname);
 		goto out;
 	}
 
-	if (!append_addr_opt(&saddr, extra_opts))
+	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"),
@@ -341,6 +247,7 @@ int nfsmount_s(const char *spec, const char *node, int flags,
 	retval = EX_SUCCESS;
 
 out:
+	po_destroy(options);
 	return retval;
 }
 
@@ -361,6 +268,7 @@ out:
 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, retval = EX_FAIL;
@@ -372,19 +280,23 @@ int nfs4mount_s(const char *spec, const char *node, int flags,
 	if (!err)
 		goto out;
 
-	extract_interesting_options(*extra_opts);
-
-	if (addr_opt) {
-		nfs_error(_("%s: Illegal option: 'addr='"), progname);
+	options = po_split(*extra_opts);
+	if (!options) {
+		nfs_error(_("%s: internal option parsing error"), progname);
 		goto out;
 	}
 
-	if (!append_addr_opt(&saddr, extra_opts))
+	if (!append_addr_option(&saddr, options))
 		goto out;
 
-	if (!ca_opt && !append_clientaddr_opt(&saddr, extra_opts))
+	if (!append_clientaddr_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"),
 			progname, *extra_opts);
@@ -400,5 +312,6 @@ int nfs4mount_s(const char *spec, const char *node, int flags,
 	retval = EX_SUCCESS;
 
 out:
+	po_destroy(options);
 	return retval;
 }