- static char hostdir[1024], new_opts[1024], ip_addr[255];
- char *hostname, *dirname, *s, *old_opts;
- struct sockaddr_in addr;
-
- if (strlen(spec) >= sizeof(hostdir)) {
- nfs_error(_("%s: excessively long host:dir argument\n"),
- progname);
- return 0;
+ struct mount_options *options;
+ char *option, new_option[64];
+ clnt_addr_t mnt_server = { };
+ clnt_addr_t nfs_server = { };
+ int p;
+
+ options = po_split(str);
+ if (!options)
+ return NULL;
+
+ 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));
+
+ option = po_get(options, "mountport");
+ if (option)
+ mnt_server.pmap.pm_port = atoi(option);
+ mnt_server.pmap.pm_prog = MOUNTPROG;
+ option = po_get(options, "mountprog");
+ if (option)
+ mnt_server.pmap.pm_prog = atoi(option);
+ option = po_get(options, "mountvers");
+ if (option)
+ mnt_server.pmap.pm_vers = atoi(option);
+
+ option = po_get(options, "port");
+ if (option) {
+ nfs_server.pmap.pm_port = atoi(option);
+ po_remove_all(options, "port");