svn commit: r339380 - head/usr.sbin/pw

[Yuri Pankov]

Author: yuripv
Date: Tue Oct 16 16:00:41 2018
New Revision: 339380
URL: https://svnweb.freebsd.org/changeset/base/339380

Log:
  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

Modified:
  head/usr.sbin/pw/pw.c
  head/usr.sbin/pw/pw.h
  head/usr.sbin/pw/pw_conf.c

Modified: head/usr.sbin/pw/pw.c
==============================================================================
--- head/usr.sbin/pw/pw.c	Tue Oct 16 15:57:16 2018	(r339379)
+++ head/usr.sbin/pw/pw.c	Tue Oct 16 16:00:41 2018	(r339380)
@@ -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;
 		}

Modified: head/usr.sbin/pw/pw.h
==============================================================================
--- head/usr.sbin/pw/pw.h	Tue Oct 16 15:57:16 2018	(r339379)
+++ head/usr.sbin/pw/pw.h	Tue Oct 16 16:00:41 2018	(r339380)
@@ -65,7 +65,6 @@ enum _which
 
 #define	_DEF_DIRMODE	(S_IRWXU | S_IRWXG | S_IRWXO)
 #define	_PW_CONF	"pw.conf"
-#define _PATH_PW_CONF	"/etc/pw.conf"
 #define _UC_MAXLINE	1024
 #define _UC_MAXSHELLS	32
 

Modified: head/usr.sbin/pw/pw_conf.c
==============================================================================
--- head/usr.sbin/pw/pw_conf.c	Tue Oct 16 15:57:16 2018	(r339379)
+++ head/usr.sbin/pw/pw_conf.c	Tue Oct 16 16:00:41 2018	(r339380)
@@ -255,9 +255,6 @@ read_userconfig(char const * file)
 	buf = NULL;
 	linecap = 0;
 
-	if (file == NULL)
-		file = _PATH_PW_CONF;
-
 	if ((fp = fopen(file, "r")) == NULL)
 		return (&config);