From owner-svn-src-stable@freebsd.org  Thu Aug  3 07:17:43 2017
Return-Path: <owner-svn-src-stable@freebsd.org>
Delivered-To: svn-src-stable@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 0825DDCE03A;
 Thu,  3 Aug 2017 07:17:43 +0000 (UTC) (envelope-from mav@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 C607C6A846;
 Thu,  3 Aug 2017 07:17:42 +0000 (UTC) (envelope-from mav@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v737HfQU085755;
 Thu, 3 Aug 2017 07:17:41 GMT (envelope-from mav@FreeBSD.org)
Received: (from mav@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v737HfxK085754;
 Thu, 3 Aug 2017 07:17:41 GMT (envelope-from mav@FreeBSD.org)
Message-Id: <201708030717.v737HfxK085754@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: mav set sender to mav@FreeBSD.org
 using -f
From: Alexander Motin <mav@FreeBSD.org>
Date: Thu, 3 Aug 2017 07:17:41 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org
Subject: svn commit: r321975 - stable/11/usr.bin/w
X-SVN-Group: stable-11
X-SVN-Commit-Author: mav
X-SVN-Commit-Paths: stable/11/usr.bin/w
X-SVN-Commit-Revision: 321975
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
 <svn-src-stable.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable>, 
 <mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable/>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 03 Aug 2017 07:17:43 -0000

Author: mav
Date: Thu Aug  3 07:17:41 2017
New Revision: 321975
URL: https://svnweb.freebsd.org/changeset/base/321975

Log:
  MFC r321620: Fix singular/plural "users" output.
  
  It was broken during libxo'fication.
  
  PR:		221039
  Submitted by:	timur@

Modified:
  stable/11/usr.bin/w/w.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/usr.bin/w/w.c
==============================================================================
--- stable/11/usr.bin/w/w.c	Thu Aug  3 07:00:55 2017	(r321974)
+++ stable/11/usr.bin/w/w.c	Thu Aug  3 07:17:41 2017	(r321975)
@@ -511,7 +511,7 @@ pr_header(time_t *nowp, int nusers)
 	}
 
 	/* Print number of users logged in to system */
-	xo_emit(" {:users/%d} {N:user%s}", nusers, nusers == 1 ? "" : "s");
+	xo_emit(" {:users/%d} {Np:user,users}", nusers);
 
 	/*
 	 * Print 1, 5, and 15 minute load averages.