X-Git-Url: https://git.decadent.org.uk/gitweb/?p=nfs-utils.git;a=blobdiff_plain;f=utils%2Fmount%2Fnfsumount.c;h=1b3c8d105daba1e05bca2c592b4825f9930a72d1;hp=e65f58f0122374ad92f881d96e7072a9f0fbe03e;hb=01a13cd0f4acb7375c16a10965d2cff765d9647a;hpb=b3b111b1bd5fbc678419bf1964b6093045081139

diff --git a/utils/mount/nfsumount.c b/utils/mount/nfsumount.c
index e65f58f..1b3c8d1 100644
--- a/utils/mount/nfsumount.c
+++ b/utils/mount/nfsumount.c
@@ -34,6 +34,8 @@
 #include "mount_constants.h"
 #include "mount.h"
 #include "nfsumount.h"
+#include "error.h"
+#include "network.h"
 
 #if !defined(MNT_FORCE)
 /* dare not try to include <linux/mount.h> -- lots of errors */
@@ -45,17 +47,12 @@
 #endif
 
 extern char *progname;
-extern int nfs_mount_version;
 extern int nomtab;
 extern int verbose;
 int force;
 int lazy;
 int remount;
 
-extern int find_kernel_nfs_mount_version(void);
-extern int probe_mntport(clnt_addr_t *);
-extern int nfs_gethostbyname(const char *, struct sockaddr_in *);
-
 static inline enum clnt_stat
 nfs_umount(dirpath *argp, CLIENT *clnt)
 {
@@ -93,30 +90,6 @@ int nfs_call_umount(clnt_addr_t *mnt_server, dirpath *argp)
 	return res;
 }
 
-/* complain about a failed umount */
-static void complain(int err, const char *dev) {
-  switch (err) {
-    case ENXIO:
-      nfs_error (_("umount: %s: invalid block device"), dev); break;
-    case EINVAL:
-      nfs_error (_("umount: %s: not mounted"), dev); break;
-    case EIO:
-      nfs_error (_("umount: %s: can't write superblock"), dev); break;
-    case EBUSY:
-     /* Let us hope fstab has a line "proc /proc ..."
-        and not "none /proc ..."*/
-      nfs_error (_("umount: %s: device is busy"), dev); break;
-    case ENOENT:
-      nfs_error (_("umount: %s: not found"), dev); break;
-    case EPERM:
-      nfs_error (_("umount: %s: must be superuser to umount"), dev); break;
-    case EACCES:
-      nfs_error (_("umount: %s: block devices not permitted on fs"), dev); break;
-    default:
-      nfs_error (_("umount: %s: %s"), dev, strerror (err)); break;
-  }
-}
-
 int del_mtab(const char *spec, const char *node)
 {
 	int umnt_err, res;
@@ -183,8 +156,8 @@ int del_mtab(const char *spec, const char *node)
                 return 0;
 
         if (umnt_err)
-                complain(umnt_err, node);
-        return 1;
+                umount_error(umnt_err, node);
+        return EX_FILEIO;
 }
 
 /*
@@ -199,7 +172,6 @@ int _nfsumount(const char *spec, char *opts)
 	struct pmap *pmap = &mnt_server.pmap;
 	char *p;
 
-	nfs_mount_version = find_kernel_nfs_mount_version();
 	if (spec == NULL || (p = strchr(spec,':')) == NULL)
 		goto out_bad;
 	hostname = xstrndup(spec, p-spec);
@@ -335,7 +307,7 @@ int nfsumount(int argc, char *argv[])
 	    strcmp(mc->m.mnt_type, "nfs4") != 0) {
 		fprintf(stderr, "umount.nfs: %s on %s it not an nfs filesystem\n",
 			mc->m.mnt_fsname, mc->m.mnt_dir);
-		exit(1);
+		return EX_USAGE;
 	}
 
 	if (getuid() != 0) {
@@ -375,15 +347,14 @@ int nfsumount(int argc, char *argv[])
 	ret = 0;
 	if (mc) {
 		if (!lazy)
-			ret = _nfsumount(mc->m.mnt_fsname, mc->m.mnt_opts);
-		if(ret)
-			ret = del_mtab(mc->m.mnt_fsname, mc->m.mnt_dir);
+			_nfsumount(mc->m.mnt_fsname, mc->m.mnt_opts);
+		ret = del_mtab(mc->m.mnt_fsname, mc->m.mnt_dir);
 	} else if (*spec != '/') {
 		if (!lazy)
-			ret = _nfsumount(spec, "tcp,v3");
+			_nfsumount(spec, "tcp,v3");
 	} else
 		ret = del_mtab(NULL, spec);
 
-	return(ret);
+	return ret;
 }