umount.nfs: Make do_nfs_mount use conventional EX_ style return codes

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

diff --git a/utils/mount/nfsumount.c b/utils/mount/nfsumount.c
index b6a87f2ffaa315524f64f9f597316352197633c7..fd4194faf6d196e1e572e53beeadf29a50dec718 100644 (file)
--- a/utils/mount/nfsumount.c
+++ b/utils/mount/nfsumount.c
@@ -53,44 +53,7 @@ int force;
 int lazy;
 int remount;
 
-static inline enum clnt_stat
-nfs_umount(dirpath *argp, CLIENT *clnt)
-{
-       return clnt_call(clnt, MOUNTPROC_UMNT,
-                        (xdrproc_t) xdr_dirpath, (caddr_t)argp,
-                        (xdrproc_t) xdr_void, NULL,
-                        TIMEOUT);
-}
-
-int nfs_call_umount(clnt_addr_t *mnt_server, dirpath *argp)
-{
-       CLIENT *clnt;
-       enum clnt_stat res = 0;
-       int msock;
-
-       switch (mnt_server->pmap.pm_vers) {
-       case 3:
-       case 2:
-       case 1:
-               if (!probe_mntport(mnt_server))
-                       goto out_bad;
-               clnt = mnt_openclnt(mnt_server, &msock);
-               if (!clnt)
-                       goto out_bad;
-               res = nfs_umount(argp, clnt);
-               mnt_closeclnt(clnt, msock);
-               if (res == RPC_SUCCESS)
-                       return 1;
-               break;
-       default:
-               res = 1;
-               break;
-       }
- out_bad:
-       return res;
-}
-
-int del_mtab(const char *spec, const char *node)
+static int del_mtab(const char *spec, const char *node)
 {
        int umnt_err, res;
 
@@ -158,10 +121,7 @@ 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;
@@ -170,10 +130,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
@@ -200,7 +170,6 @@ int _nfsumount(const char *spec, char *opts)
 
        pmap->pm_prog = MOUNTPROG;
        pmap->pm_vers = MOUNTVERS_NFSV3;
-       pmap->pm_prot = IPPROTO_TCP;
        if (opts && (p = strstr(opts, "mountprog=")) && isdigit(*(p+10)))
                pmap->pm_prog = atoi(p+10);
        if (opts && (p = strstr(opts, "mountport=")) && isdigit(*(p+10)))
@@ -218,11 +187,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;
 }
 
@@ -236,7 +212,7 @@ static struct option umount_longopts[] =
   { NULL, 0, 0, 0 }
 };
 
-void umount_usage()
+static void umount_usage(void)
 {
        printf("usage: %s dir [-fvnrlh]\n", progname);
        printf("options:\n\t-f\t\tforce unmount\n");
@@ -253,6 +229,11 @@ int nfsumount(int argc, char *argv[])
        char *spec;
        struct mntentchn *mc;
 
+       if (argc < 2) {
+               umount_usage();
+               return EX_USAGE;
+       }
+
        spec = argv[1];
 
        argv += 1;
@@ -281,17 +262,17 @@ int nfsumount(int argc, char *argv[])
                case 'h':
                default:
                        umount_usage();
-                       return 0;
+                       return EX_USAGE;
                }
        }
        if (optind != argc) {
                umount_usage();
-               return 0;
+               return EX_USAGE;
        }
        
        if (spec == NULL || (*spec != '/' && strchr(spec,':') == NULL)) {
-               printf(_("umount: %s: not found\n"), spec);
-               return 0;
+               nfs_error(_("%s: %s: not found\n"), progname, spec);
+               return EX_USAGE;
        }
 
        if (*spec == '/')
@@ -319,7 +300,7 @@ int nfsumount(int argc, char *argv[])
                only_root:
                        nfs_error(_("%s: You are not permitted to unmount %s"),
                                        progname, spec);
-                       return 0;
+                       return EX_USAGE;
                }
                if (hasmntopt(&mc->m, "users") == NULL) {
                        char *opt = hasmntopt(&mc->m, "user");
@@ -345,14 +326,13 @@ int nfsumount(int argc, char *argv[])
        ret = 0;
        if (mc) {
                if (!lazy)
-                       _nfsumount(mc->m.mnt_fsname, mc->m.mnt_opts);
+                       do_nfs_umount(mc->m.mnt_fsname, mc->m.mnt_opts);
                ret = del_mtab(mc->m.mnt_fsname, mc->m.mnt_dir);
        } else if (*spec != '/') {
                if (!lazy)
-                       _nfsumount(spec, "tcp,v3");
+                       do_nfs_umount(spec, "tcp,v3");
        } else
                ret = del_mtab(NULL, spec);
 
        return ret;
 }
-