mount: move generic functions to utils.c and network.c

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

diff --git a/utils/mount/nfsumount.c b/utils/mount/nfsumount.c
index 02d40ff9d2bcb32457f1414b073cbec16cb4f0b9..8cd28528b1a01d4c4b86b3306189088b6a927d2a 100644 (file)
--- a/utils/mount/nfsumount.c
+++ b/utils/mount/nfsumount.c
@@ -37,6 +37,7 @@
 #include "network.h"
 #include "parse_opt.h"
 #include "parse_dev.h"
+#include "utils.h"
 
 #define MOUNTSFILE     "/proc/mounts"
 #define LINELEN                (4096)
@@ -138,113 +139,6 @@ static int del_mtab(const char *spec, const char *node)
        return EX_FILEIO;
 }
 
-/*
- * Discover mount server's hostname/address by examining mount options
- *
- * Returns a pointer to a string that the caller must free, on
- * success; otherwise NULL is returned.
- */
-static char *nfs_umount_hostname(struct mount_options *options,
-                                char *hostname)
-{
-       char *option;
-
-       option = po_get(options, "mountaddr");
-       if (option)
-               goto out;
-       option = po_get(options, "mounthost");
-       if (option)
-               goto out;
-       option = po_get(options, "addr");
-       if (option)
-               goto out;
-
-       return hostname;
-
-out:
-       free(hostname);
-       return strdup(option);
-}
-
-/*
- * Returns EX_SUCCESS if mount options and device name have been
- * parsed successfully; otherwise EX_FAIL.
- */
-static int nfs_umount_do_umnt(struct mount_options *options,
-                             char **hostname, char **dirname)
-{
-       union {
-               struct sockaddr         sa;
-               struct sockaddr_in      s4;
-               struct sockaddr_in6     s6;
-       } address;
-       struct sockaddr *sap = &address.sa;
-       socklen_t salen = sizeof(address);
-       struct pmap nfs_pmap, mnt_pmap;
-       sa_family_t family;
-
-       if (!nfs_options2pmap(options, &nfs_pmap, &mnt_pmap))
-               return EX_FAIL;
-
-       /* Skip UMNT call for vers=4 mounts */
-       if (nfs_pmap.pm_vers == 4)
-               return EX_SUCCESS;
-
-       *hostname = nfs_umount_hostname(options, *hostname);
-       if (!*hostname) {
-               nfs_error(_("%s: out of memory"), progname);
-               return EX_FAIL;
-       }
-
-       if (!nfs_mount_proto_family(options, &family))
-               return 0;
-       if (!nfs_lookup(*hostname, family, sap, &salen))
-               /* nfs_lookup reports any errors */
-               return EX_FAIL;
-
-       if (nfs_advise_umount(sap, salen, &mnt_pmap, dirname) == 0)
-               /* nfs_advise_umount reports any errors */
-               return EX_FAIL;
-
-       return EX_SUCCESS;
-}
-
-/*
- * Pick up certain mount options used during the original mount
- * from /etc/mtab.  The basics include the server's IP address and
- * the server pathname of the share to unregister.
- *
- * These options might also describe the mount port, mount protocol
- * version, and transport protocol used to punch through a firewall.
- * We will need this information to get through the firewall again
- * to do the umount.
- *
- * Note that option parsing failures won't necessarily cause the
- * umount request to fail.  Those values will be left zero in the
- * pmap tuple.  If the GETPORT call later fails to disambiguate them,
- * then we fail.
- */
-static int nfs_umount23(const char *devname, char *string)
-{
-       char *hostname, *dirname;
-       struct mount_options *options;
-       int result = EX_FAIL;
-
-       if (!nfs_parse_devname(devname, &hostname, &dirname))
-               return EX_USAGE;
-
-       options = po_split(string);
-       if (options) {
-               result = nfs_umount_do_umnt(options, &hostname, &dirname);
-               po_destroy(options);
-       } else
-               nfs_error(_("%s: option parsing error"), progname);
-
-       free(hostname);
-       free(dirname);
-       return result;
-}
-
 /*
  * Detect NFSv4 mounts.
  *
@@ -340,17 +234,6 @@ static struct option umount_longopts[] =
   { NULL, 0, 0, 0 }
 };
 
-static void umount_usage(void)
-{
-       printf(_("usage: %s dir [-fvnrlh]\n"), progname);
-       printf(_("options:\n\t-f\t\tforce unmount\n"));
-       printf(_("\t-v\tverbose\n"));
-       printf(_("\t-n\tDo not update /etc/mtab\n"));
-       printf(_("\t-r\tremount\n"));
-       printf(_("\t-l\tlazy unmount\n"));
-       printf(_("\t-h\tprint this help\n\n"));
-}
-
 int nfsumount(int argc, char *argv[])
 {
        int c, ret;