libnfs.a: eliminate conn.c and conn.h

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

diff --git a/utils/mount/nfsumount.c b/utils/mount/nfsumount.c
index 51349f1a02e2f6b40e74318089b68243ca2bda5a..0c667176f7ca325b84e99930c87517c19c13f649 100644 (file)
--- a/utils/mount/nfsumount.c
+++ b/utils/mount/nfsumount.c
@@ -29,11 +29,9 @@
 #include "xcommon.h"
 #include "fstab.h"
 #include "nls.h"
-#include "conn.h"
 
 #include "mount_constants.h"
 #include "mount.h"
-#include "nfsumount.h"
 #include "error.h"
 #include "network.h"
 
@@ -121,10 +119,7 @@ static int del_mtab(const char *spec, const char *node)
         return EX_FILEIO;
 }
 
-/*
- * Returns 1 if everything went well, else 0.
- */
-int _nfsumount(const char *spec, char *opts)
+static int do_nfs_umount(const char *spec, char *opts)
 {
        char *hostname;
        char *dirname;
@@ -133,10 +128,20 @@ int _nfsumount(const char *spec, char *opts)
        struct pmap *pmap = &mnt_server.pmap;
        char *p;
 
-       if (spec == NULL || (p = strchr(spec,':')) == NULL)
-               goto out_bad;
-       hostname = xstrndup(spec, p-spec);
-       dirname = xstrdup(p+1);
+       if (spec == NULL) {
+               nfs_error(_("%s: No NFS export name was provided"),
+                               progname);
+               return EX_USAGE;
+       }
+       
+       p = strchr(spec, ':');
+       if (p == NULL) {
+               nfs_error(_("%s: '%s' is not a legal NFS export name"),
+                               progname, spec);
+               return EX_USAGE;
+       }
+       hostname = xstrndup(spec, p - spec);
+       dirname = xstrdup(p + 1);
 #ifdef NFS_MOUNT_DEBUG
        printf(_("host: %s, directory: %s\n"), hostname, dirname);
 #endif
@@ -180,11 +185,18 @@ int _nfsumount(const char *spec, char *opts)
        if (opts && (hasmntopt(&mnt, "udp") || hasmntopt(&mnt, "proto=udp")))
                pmap->pm_prot = IPPROTO_UDP;
 
-       if (!nfs_gethostbyname(hostname, &mnt_server.saddr))
-               goto out_bad;
-       return nfs_call_umount(&mnt_server, &dirname);
- out_bad:
-       nfs_error(_("%s: %s: not found or not mounted"), progname, spec);
+       if (!nfs_gethostbyname(hostname, &mnt_server.saddr)) {
+               nfs_error(_("%s: '%s' does not contain a recognized hostname"),
+                               progname, spec);
+               return EX_USAGE;
+       }
+
+       if (!nfs_call_umount(&mnt_server, &dirname)) {
+               nfs_error(_("%s: Server failed to unmount '%s'"),
+                               progname, spec);
+               return EX_USAGE;
+       }
+
        return 0;
 }
 
@@ -312,11 +324,12 @@ int nfsumount(int argc, char *argv[])
        ret = 0;
        if (mc) {
                if (!lazy)
-                       _nfsumount(mc->m.mnt_fsname, mc->m.mnt_opts);
-               ret = del_mtab(mc->m.mnt_fsname, mc->m.mnt_dir);
+                       ret = do_nfs_umount(mc->m.mnt_fsname, mc->m.mnt_opts);
+               if (!ret || force)
+                       ret = del_mtab(mc->m.mnt_fsname, mc->m.mnt_dir);
        } else if (*spec != '/') {
                if (!lazy)
-                       _nfsumount(spec, "tcp,v3");
+                       ret = do_nfs_umount(spec, "tcp,v3");
        } else
                ret = del_mtab(NULL, spec);