summaryrefslogtreecommitdiffstats
path: root/usr.sbin/pw/pw.c
diff options
context:
space:
mode:
authorbapt <bapt@FreeBSD.org>2014-11-12 22:27:53 +0000
committerbapt <bapt@FreeBSD.org>2014-11-12 22:27:53 +0000
commit76d74e0d6c9c33b393a180d72b3ad23ff17c9353 (patch)
treeeabc82a38c7095200d26a38cbe569f6a317e08db /usr.sbin/pw/pw.c
parent67605a50d7b52c2bb0294fbb8bc5b62f7bfff1af (diff)
downloadFreeBSD-src-76d74e0d6c9c33b393a180d72b3ad23ff17c9353.zip
FreeBSD-src-76d74e0d6c9c33b393a180d72b3ad23ff17c9353.tar.gz
Fix wrong message when using pw -V with a non existent directory
Add a regression test about it PR: 194971 Submitted by: Freddy DISSAUX <bugzilla@dsx.bsdsx.fr>
Diffstat (limited to 'usr.sbin/pw/pw.c')
-rw-r--r--usr.sbin/pw/pw.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/usr.sbin/pw/pw.c b/usr.sbin/pw/pw.c
index b0ac728..ff48db7 100644
--- a/usr.sbin/pw/pw.c
+++ b/usr.sbin/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;
OpenPOWER on IntegriCloud