- 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++;
- }
+ struct mount_options *options;
+ char *option, new_option[64];
+ clnt_addr_t mnt_server = { };
+ clnt_addr_t nfs_server = { };
+
+ options = po_split(str);
+ if (!options) {
+ errno = EFAULT;
+ return NULL;
+ }
+
+ errno = EINVAL;
+ option = po_get(options, "addr");
+ if (option) {
+ nfs_server.saddr.sin_family = AF_INET;
+ if (!inet_aton((const char *)option, &nfs_server.saddr.sin_addr))
+ goto err;
+ } else
+ goto err;
+
+ option = po_get(options, "mountaddr");
+ if (option) {
+ mnt_server.saddr.sin_family = AF_INET;
+ if (!inet_aton((const char *)option, &mnt_server.saddr.sin_addr))
+ goto err;
+ } else
+ memcpy(&mnt_server.saddr, &nfs_server.saddr,
+ sizeof(mnt_server.saddr));
+
+ nfs_options2pmap(options, &nfs_server.pmap, &mnt_server.pmap);
+
+ /* 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;
+ mnt_server.pmap.pm_prog = MOUNTPROG;
+
+ if (!probe_bothports(&mnt_server, &nfs_server)) {
+ errno = ESPIPE;
+ goto err;
+ }
+
+ snprintf(new_option, sizeof(new_option) - 1,
+ "nfsvers=%lu", nfs_server.pmap.pm_vers);
+ if (po_append(options, new_option) == PO_FAILED)
+ goto err;
+
+ if (nfs_server.pmap.pm_prot == IPPROTO_TCP)
+ snprintf(new_option, sizeof(new_option) - 1,
+ "proto=tcp");
+ else
+ snprintf(new_option, sizeof(new_option) - 1,
+ "proto=udp");
+ if (po_append(options, new_option) == PO_FAILED)
+ goto err;
+
+ if (nfs_server.pmap.pm_port != NFS_PORT) {
+ snprintf(new_option, sizeof(new_option) - 1,
+ "port=%lu", nfs_server.pmap.pm_port);
+ if (po_append(options, new_option) == PO_FAILED)
+ goto err;
+