Skip site navigation (1)Skip section navigation (2) 
Date:      Sat, 11 Jul 2015 17:01:09 +0000 (UTC)
From:      Baptiste Daroussin <bapt@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r285396 - head/usr.sbin/pw
Message-ID:  <201507111701.t6BH19jf091195@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: bapt
Date: Sat Jul 11 17:01:08 2015
New Revision: 285396
URL: https://svnweb.freebsd.org/changeset/base/285396

Log:
  Move the quiet flag into the configuration structure

Modified:
  head/usr.sbin/pw/pw.c
  head/usr.sbin/pw/pw_group.c
  head/usr.sbin/pw/pw_user.c
  head/usr.sbin/pw/pwupd.h

Modified: head/usr.sbin/pw/pw.c
==============================================================================
--- head/usr.sbin/pw/pw.c	Sat Jul 11 16:58:47 2015	(r285395)
+++ head/usr.sbin/pw/pw.c	Sat Jul 11 17:01:08 2015	(r285396)
@@ -314,6 +314,9 @@ main(int argc, char *argv[])
 		case 'o':
 			conf.checkduplicate = true;
 			break;
+		case 'q':
+			conf.quiet = true;
+			break;
 		default:
 			addarg(&arglist, ch, optarg);
 			break;
@@ -334,7 +337,7 @@ main(int argc, char *argv[])
 	 * We should immediately look for the -q 'quiet' switch so that we
 	 * don't bother with extraneous errors
 	 */
-	if (getarg(&arglist, 'q') != NULL)
+	if (conf.quiet)
 		freopen(_PATH_DEVNULL, "w", stderr);
 
 	/*

Modified: head/usr.sbin/pw/pw_group.c
==============================================================================
--- head/usr.sbin/pw/pw_group.c	Sat Jul 11 16:58:47 2015	(r285395)
+++ head/usr.sbin/pw/pw_group.c	Sat Jul 11 17:01:08 2015	(r285396)
@@ -122,7 +122,7 @@ pw_group(int mode, char *name, long id, 
 	};
 
 	if (mode == M_NEXT)
-		return (pw_groupnext(cnf, getarg(args, 'q') != NULL));
+		return (pw_groupnext(cnf, conf.quiet));
 
 	if (mode == M_LOCK || mode == M_UNLOCK)
 		errx(EX_USAGE, "'lock' command is not available for groups");

Modified: head/usr.sbin/pw/pw_user.c
==============================================================================
--- head/usr.sbin/pw/pw_user.c	Sat Jul 11 16:58:47 2015	(r285395)
+++ head/usr.sbin/pw/pw_user.c	Sat Jul 11 17:01:08 2015	(r285396)
@@ -231,7 +231,7 @@ pw_user(int mode, char *name, long id, s
 	cnf = conf.userconf;
 
 	if (mode == M_NEXT)
-		return (pw_usernext(cnf, getarg(args, 'q') != NULL));
+		return (pw_usernext(cnf, conf.quiet));
 
 	/*
 	 * We can do all of the common legwork here

Modified: head/usr.sbin/pw/pwupd.h
==============================================================================
--- head/usr.sbin/pw/pwupd.h	Sat Jul 11 16:58:47 2015	(r285395)
+++ head/usr.sbin/pw/pwupd.h	Sat Jul 11 17:01:08 2015	(r285396)
@@ -87,6 +87,7 @@ struct pwconf {
 	char		*config;
 	int		 fd;
 	int		 which;
+	bool		 quiet;
 	bool		 dryrun;
 	bool		 pretty;
 	bool		 v7;

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201507111701.t6BH19jf091195>