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;
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;
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
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;
}
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);