X-Git-Url: https://git.decadent.org.uk/gitweb/?p=nfs-utils.git;a=blobdiff_plain;f=utils%2Fmount%2Fnfsumount.c;h=3d387c11e8c3a01b32fbab9004dcbe20f94c9b7a;hp=aa68deeb83b2c9e32a8c0a91b317a24647c0b93a;hb=5e30f39229acd1cb9e5e6fa73c6adb34401866d3;hpb=5835b1eec5a1f1e463c0762c510c6643fa2bff62

diff --git a/utils/mount/nfsumount.c b/utils/mount/nfsumount.c
index aa68dee..3d387c1 100644
--- a/utils/mount/nfsumount.c
+++ b/utils/mount/nfsumount.c
@@ -200,7 +200,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)))
@@ -236,7 +235,7 @@ static struct option umount_longopts[] =
   { NULL, 0, 0, 0 }
 };
 
-void umount_usage(void)
+static void umount_usage(void)
 {
 	printf("usage: %s dir [-fvnrlh]\n", progname);
 	printf("options:\n\t-f\t\tforce unmount\n");
@@ -253,6 +252,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 +285,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 +323,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");