text-based mount options: Use new pmap stuffer when rewriting mount options

[nfs-utils.git] / utils / mount / stropts.c

diff --git a/utils/mount/stropts.c b/utils/mount/stropts.c
index e4a440890e89ad01b628b4d8aebd4e865e1c8e1f..99be0f3844023a35f975f6473aea41085432ba88 100644 (file)
--- a/utils/mount/stropts.c
+++ b/utils/mount/stropts.c
@@ -99,19 +99,21 @@ struct nfsmount_info {
 static time_t nfs_parse_retry_option(struct mount_options *options,
                                     unsigned int timeout_minutes)
 {
-       char *retry_option, *endptr;
+       long tmp;
 
-       retry_option = po_get(options, "retry");
-       if (retry_option) {
-               long tmp;
-
-               errno = 0;
-               tmp = strtol(retry_option, &endptr, 10);
-               if (errno == 0 && endptr != retry_option && tmp >= 0)
+       switch (po_get_numeric(options, "retry", &tmp)) {
+       case PO_NOT_FOUND:
+               break;
+       case PO_FOUND:
+               if (tmp >= 0) {
                        timeout_minutes = tmp;
-               else if (verbose)
+                       break;
+               }
+       case PO_BAD_VALUE:
+               if (verbose)
                        nfs_error(_("%s: invalid retry timeout was specified; "
                                        "using default timeout"), progname);
+               break;
        }
 
        return time(NULL) + (time_t)(timeout_minutes * 60);
@@ -222,9 +224,15 @@ static int nfs_fix_mounthost_option(const sa_family_t family,
  * Returns zero if the "lock" option is in effect, but statd
  * can't be started.  Otherwise, returns 1.
  */
+static const char *nfs_lock_opttbl[] = {
+       "nolock",
+       "lock",
+       NULL,
+};
+
 static int nfs_verify_lock_option(struct mount_options *options)
 {
-       if (po_rightmost(options, "nolock", "lock") == PO_KEY1_RIGHTMOST)
+       if (po_rightmost(options, nfs_lock_opttbl) == 1)
                return 1;
 
        if (!start_statd()) {
@@ -320,7 +328,6 @@ static struct mount_options *nfs_rewrite_mount_options(char *str)
        char *option, new_option[64];
        clnt_addr_t mnt_server = { };
        clnt_addr_t nfs_server = { };
-       int p;
 
        options = po_split(str);
        if (!options) {
@@ -346,53 +353,13 @@ static struct mount_options *nfs_rewrite_mount_options(char *str)
                memcpy(&mnt_server.saddr, &nfs_server.saddr,
                                sizeof(mnt_server.saddr));
 
-       option = po_get(options, "mountport");
-       if (option)
-               mnt_server.pmap.pm_port = atoi(option);
-       mnt_server.pmap.pm_prog = MOUNTPROG;
-       option = po_get(options, "mountvers");
-       if (option)
-               mnt_server.pmap.pm_vers = atoi(option);
+       nfs_options2pmap(options, &nfs_server.pmap, &mnt_server.pmap);
 
-       option = po_get(options, "port");
-       if (option) {
-               nfs_server.pmap.pm_port = atoi(option);
-               po_remove_all(options, "port");
-       }
+       /* The kernel NFS client doesn't support changing the RPC program
+        * number for these services, so reset these fields before probing
+        * the server's ports.  */
        nfs_server.pmap.pm_prog = NFS_PROGRAM;
-
-       option = po_get(options, "nfsvers");
-       if (option) {
-               nfs_server.pmap.pm_vers = atoi(option);
-               po_remove_all(options, "nfsvers");
-       }
-       option = po_get(options, "vers");
-       if (option) {
-               nfs_server.pmap.pm_vers = atoi(option);
-               po_remove_all(options, "vers");
-       }
-       option = po_get(options, "proto");
-       if (option) {
-               if (strcmp(option, "tcp") == 0) {
-                       nfs_server.pmap.pm_prot = IPPROTO_TCP;
-                       po_remove_all(options, "proto");
-               }
-               if (strcmp(option, "udp") == 0) {
-                       nfs_server.pmap.pm_prot = IPPROTO_UDP;
-                       po_remove_all(options, "proto");
-               }
-       }
-       p = po_rightmost(options, "tcp", "udp");
-       switch (p) {
-       case PO_KEY2_RIGHTMOST:
-               nfs_server.pmap.pm_prot = IPPROTO_UDP;
-               break;
-       case PO_KEY1_RIGHTMOST:
-               nfs_server.pmap.pm_prot = IPPROTO_TCP;
-               break;
-       }
-       po_remove_all(options, "tcp");
-       po_remove_all(options, "udp");
+       mnt_server.pmap.pm_prog = MOUNTPROG;
 
        if (!probe_bothports(&mnt_server, &nfs_server)) {
                errno = ESPIPE;
@@ -421,6 +388,20 @@ static struct mount_options *nfs_rewrite_mount_options(char *str)
 
        }
 
+       if (mnt_server.pmap.pm_prot == IPPROTO_TCP)
+               snprintf(new_option, sizeof(new_option) - 1,
+                        "mountproto=tcp");
+       else
+               snprintf(new_option, sizeof(new_option) - 1,
+                        "mountproto=udp");
+       if (po_append(options, new_option) == PO_FAILED)
+               goto err;
+
+       snprintf(new_option, sizeof(new_option) - 1,
+                "mountport=%lu", mnt_server.pmap.pm_port);
+       if (po_append(options, new_option) == PO_FAILED)
+               goto err;
+
        errno = 0;
        return options;
 
@@ -695,12 +676,18 @@ static int nfsmount_bg(struct nfsmount_info *mi)
  *
  * Returns a valid mount command exit code.
  */
+static const char *nfs_background_opttbl[] = {
+       "bg",
+       "fg",
+       NULL,
+};
+
 static int nfsmount_start(struct nfsmount_info *mi)
 {
        if (!nfs_validate_options(mi))
                return EX_FAIL;
 
-       if (po_rightmost(mi->options, "bg", "fg") == PO_KEY1_RIGHTMOST)
+       if (po_rightmost(mi->options, nfs_background_opttbl) == 1)
                return nfsmount_bg(mi);
        else
                return nfsmount_fg(mi);