 @@ -1,14 +1,14 @@
-/*	$NetBSD: umount.c,v 1.52 2016/06/26 04:01:30 dholland Exp $	*/
+/*	$NetBSD: umount.c,v 1.53 2020/04/23 04:21:13 christos Exp $	*/
 /*-
  * Copyright (c) 1980, 1989, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -29,77 +29,79 @@
  * SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
 #ifndef lint
 __COPYRIGHT("@(#) Copyright (c) 1980, 1989, 1993\
  The Regents of the University of California.  All rights reserved.");
 #endif /* not lint */
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)umount.c	8.8 (Berkeley) 5/8/95";
 #else
-__RCSID("$NetBSD: umount.c,v 1.52 2016/06/26 04:01:30 dholland Exp $");
+__RCSID("$NetBSD: umount.c,v 1.53 2020/04/23 04:21:13 christos Exp $");
 #endif
 #endif /* not lint */
 #include <sys/param.h>
 #include <sys/stat.h>
 #include <sys/mount.h>
 #include <sys/time.h>
 #ifndef SMALL
 #include <sys/socket.h>
 #include <netdb.h>
 #include <rpc/rpc.h>
 #include <rpc/pmap_clnt.h>
 #include <rpc/pmap_prot.h>
 #include <nfs/rpcv2.h>
 #include <nfs/nfsmount.h>
 #endif /* !SMALL */
 #include <err.h>
 #include <errno.h>
 #include <fstab.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 #include <util.h>
 typedef enum { MNTANY, MNTON, MNTFROM } mntwhat;
 #ifndef SMALL
 #include "mountprog.h"
 static int	 fake, verbose;
 static char	*nfshost;
 static struct addrinfo *nfshost_ai = NULL;
 static int	 namematch(const struct addrinfo *);
 static int	 sacmp(const struct sockaddr *, const struct sockaddr *);
 static int	 xdr_dir(XDR *, char *);
 static const char *getmntproto(const char *);
 #endif /* !SMALL */
 static int	 fflag;
 static char	*getmntname(const char *, mntwhat, char **);
 static int	 umountfs(const char *, const char **, int);
 static void	 usage(void) __dead;
 int
 main(int argc, char *argv[])
+{
 	int ch, errs, all = 0, raw = 0;
 	char mntfromname[MAXPATHLEN];
 #ifndef SMALL
 	int mnts;
 	struct statvfs *mntbuf;
 	struct addrinfo hints;
 #endif /* SMALL */
 	const char **typelist = NULL;
 #ifdef SMALL
 #define OPTS "fR"
 #else
 #define OPTS "AaFfh:Rt:v"
 #endif
 	while ((ch = getopt(argc, argv, OPTS)) != -1)
 @@ -158,29 +160,33 @@ main(int argc, char *argv[])
 		if ((mnts = getmntinfo(&mntbuf, ST_NOWAIT)) == 0) {
 			warn("getmntinfo");
 			errs = 1;
+		}
 		for (errs = 0, mnts--; mnts > 0; mnts--) {
 			if (checkvfsname(mntbuf[mnts].f_fstypename, typelist))
 				continue;
 			if (umountfs(mntbuf[mnts].f_mntonname, typelist,
 ) != 0)
 				errs = 1;
+		}
 	} else
 #endif /* !SMALL */
-		for (errs = 0; *argv != NULL; ++argv)
+		for (errs = 0; *argv != NULL; ++argv) {
-			if (umountfs(*argv, typelist, raw) != 0)
+			if (getfsspecname(mntfromname, sizeof(mntfromname),
 			    *argv) == NULL)
 				err(EXIT_FAILURE, "%s", mntfromname);
 			if (umountfs(mntfromname, typelist, raw) != 0)
 				errs = 1;
+		}
 	return errs;
+}
 static int
 umountfs(const char *name, const char **typelist, int raw)
+{
 #ifndef SMALL
 	enum clnt_stat clnt_stat;
 	struct timeval try;
 	CLIENT *clp;
 	char *hostp = NULL;
 	struct addrinfo *ai = NULL, hints;
 	const char *proto = NULL;
 @@ -329,43 +335,47 @@ umountfs(const char *name, const char **
+		}
 		auth_destroy(clp->cl_auth);
 		clnt_destroy(clp);
+	}
 #endif /* ! SMALL */
 	return 0;
+}
 static char *
 getmntname(const char *name, mntwhat what, char **type)
+{
 	static struct statvfs *mntbuf;
 	static int mntsize;
 	static char mntfromname[MAXPATHLEN];
 	int i;
 	if (mntbuf == NULL &&
 	    (mntsize = getmntinfo(&mntbuf, MNT_NOWAIT)) == 0) {
 		warn("getmntinfo");
 		return (NULL);
+	}
 	for (i = mntsize - 1; i >= 0; i--) {
 		if ((what == MNTON) && !strcmp(mntbuf[i].f_mntfromname, name)) {
 			if (type)
 				*type = mntbuf[i].f_fstypename;
 			return (mntbuf[i].f_mntonname);
+		}
 		if ((what == MNTFROM) && !strcmp(mntbuf[i].f_mntonname, name)) {
 			if (type)
 				*type = mntbuf[i].f_fstypename;
-			return (mntbuf[i].f_mntfromname);
+			if (getfsspecname(mntfromname, sizeof(mntfromname),
 			    mntbuf[i].f_mntfromname) == NULL)
 				err(EXIT_FAILURE, "%s", mntfromname);
 			return mntfromname;
+		}
+	}
 	return (NULL);
+}
 #ifndef SMALL
 static int
 sacmp(const struct sockaddr *sa1, const struct sockaddr *sa2)
+{
 	const void *p1, *p2;
 	size_t len;
 	if (sa1->sa_family != sa2->sa_family)

 @@ -1,21 +1,23 @@
-#	$NetBSD: Makefile,v 1.19 2019/10/13 07:28:13 mrg Exp $
+#	$NetBSD: Makefile,v 1.20 2020/04/23 04:21:13 christos Exp $
 #	@(#)Makefile	8.4 (Berkeley) 6/22/95
 .include <bsd.own.mk>
 PROG=	umount
 SRCS=	umount.c
 MAN=	umount.8
 .ifdef SMALLPROG
 CPPFLAGS+= -DSMALL
 .else
 MOUNT=	${NETBSDSRCDIR}/sbin/mount
 CPPFLAGS+= -I${MOUNT}
 .PATH:	${MOUNT}
 SRCS+=	vfslist.c
 .endif
 LDADD+=-lutil
 DPADD+=${LIBUTIL}
 COPTS.umount.c+=	${GCC_NO_CAST_FUNCTION_TYPE}
 .include <bsd.prog.mk>