From owner-svn-src-head@FreeBSD.ORG  Sat Nov 17 23:49:20 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id CBD93D56;
 Sat, 17 Nov 2012 23:49:20 +0000 (UTC)
 (envelope-from grog@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id B195B8FC12;
 Sat, 17 Nov 2012 23:49:20 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qAHNnKvH009531;
 Sat, 17 Nov 2012 23:49:20 GMT (envelope-from grog@svn.freebsd.org)
Received: (from grog@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qAHNnKpC009530;
 Sat, 17 Nov 2012 23:49:20 GMT (envelope-from grog@svn.freebsd.org)
Message-Id: <201211172349.qAHNnKpC009530@svn.freebsd.org>
From: Greg Lehey <grog@FreeBSD.org>
Date: Sat, 17 Nov 2012 23:49:20 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r243201 - head/usr.bin/locale
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 17 Nov 2012 23:49:20 -0000

Author: grog
Date: Sat Nov 17 23:49:20 2012
New Revision: 243201
URL: http://svnweb.freebsd.org/changeset/base/243201

Log:
  Correctly handle keywords without options.
  
  Reported by: swills@
  MFC after:	14 days

Modified:
  head/usr.bin/locale/locale.c

Modified: head/usr.bin/locale/locale.c
==============================================================================
--- head/usr.bin/locale/locale.c	Sat Nov 17 23:44:01 2012	(r243200)
+++ head/usr.bin/locale/locale.c	Sat Nov 17 23:49:20 2012	(r243201)
@@ -279,8 +279,8 @@ main(int argc, char *argv[])
 				exit(0);
 			}
 
-	/* process '-c' and/or '-k' */
-	if (prt_categories || prt_keywords) {
+	/* process '-c', '-k', or command line arguments. */
+	if (prt_categories || prt_keywords || argc > 0) {
 		if (argc > 0) {
 			setlocale(LC_ALL, "");
 			while (argc > 0) {