From 29aa58a639334f34b8a5f1629a0b469cdf577c68 Mon Sep 17 00:00:00 2001
From: Yuri Pankov <yuripv@FreeBSD.org>
Date: Tue, 16 Oct 2018 16:00:41 +0000
Subject: pw: (file == NULL) check is always false in read_userconfig(), remove
 it.  Drop the now unused _PATH_PW_CONF definition. [1]

While here, change the last remaining hardcoded "/etc" to _PATH_PWD.

Noted by:	glebius [1]
Reviewed by:	eugen
Approved by:	re (gjb), kib (mentor)
Differential Revision:	https://reviews.freebsd.org/D17575
---
 pw/pw.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'pw/pw.c')

diff --git a/pw/pw.c b/pw/pw.c
index 5f02a15..4f92034 100644
--- a/pw/pw.c
+++ b/pw/pw.c
@@ -162,7 +162,8 @@ main(int argc, char *argv[])
 					PWF._altdir = PWF_ROOTDIR;
 				}
 				snprintf(conf.etcpath, sizeof(conf.etcpath),
-				    "%s%s", optarg, arg == 'R' ? "/etc" : "");
+				    "%s%s", optarg, arg == 'R' ?
+				    _PATH_PWD : "");
 			} else
 				break;
 		}
-- 
cgit v1.2.3-56-ge451