Reintegrate head: r274132-r277384

Sponsored by:	The FreeBSD Foundation

1 files changed, 8 insertions, 0 deletions

diff --git a/pw/pw.c b/pw/pw.c
index b0ac728..ff48db7 100644
--- a/pw/pw.c
+++ b/pw/pw.c
@@ -98,6 +98,7 @@ main(int argc, char *argv[])
 	int             which = -1;
 	char		*config = NULL;
 	struct userconf *cnf;
+	struct stat	st;
 
 	static const char *opts[W_NUM][M_NUM] =
 	{
@@ -143,6 +144,13 @@ main(int argc, char *argv[])
 			if (argv[1][1] == 'V') {
 				optarg = &argv[1][2];
 				if (*optarg == '\0') {
+					if (stat(argv[2], &st) != 0)
+						errx(EX_OSFILE, \
+						    "no such directory `%s'",
+						    argv[2]);
+					if (!S_ISDIR(st.st_mode))
+						errx(EX_OSFILE, "`%s' not a "
+						    "directory", argv[2]);
 					optarg = argv[2];
 					++argv;
 					--argc;