From owner-svn-src-all@freebsd.org  Sat Nov 26 02:49:00 2016
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 725CCC55D58;
 Sat, 26 Nov 2016 02:49:00 +0000 (UTC) (envelope-from ume@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 41BC276E;
 Sat, 26 Nov 2016 02:49:00 +0000 (UTC) (envelope-from ume@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id uAQ2mxjF056679;
 Sat, 26 Nov 2016 02:48:59 GMT (envelope-from ume@FreeBSD.org)
Received: (from ume@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id uAQ2mxfh056678;
 Sat, 26 Nov 2016 02:48:59 GMT (envelope-from ume@FreeBSD.org)
Message-Id: <201611260248.uAQ2mxfh056678@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: ume set sender to ume@FreeBSD.org
 using -f
From: Hajimu UMEMOTO <ume@FreeBSD.org>
Date: Sat, 26 Nov 2016 02:48:59 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r309181 - stable/10/usr.bin/locale
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 26 Nov 2016 02:49:00 -0000

Author: ume
Date: Sat Nov 26 02:48:59 2016
New Revision: 309181
URL: https://svnweb.freebsd.org/changeset/base/309181

Log:
  MFC r308808, r308809: Lookup locale when print all keywords as well.

Modified:
  stable/10/usr.bin/locale/locale.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/usr.bin/locale/locale.c
==============================================================================
--- stable/10/usr.bin/locale/locale.c	Sat Nov 26 02:48:04 2016	(r309180)
+++ stable/10/usr.bin/locale/locale.c	Sat Nov 26 02:48:59 2016	(r309181)
@@ -281,8 +281,9 @@ main(int argc, char *argv[])
 
 	/* process '-c', '-k', or command line arguments. */
 	if (prt_categories || prt_keywords || argc > 0) {
-		if (argc > 0) {
+		if (prt_keywords || argc > 0)
 			setlocale(LC_ALL, "");
+		if (argc > 0) {
 			while (argc > 0) {
 				showdetails(*argv);
 				argv++;