From owner-svn-src-head@FreeBSD.ORG  Thu Jun 18 16:40:00 2009
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id C3ECA106566C;
	Thu, 18 Jun 2009 16:40:00 +0000 (UTC) (envelope-from ume@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id B27D08FC1B;
	Thu, 18 Jun 2009 16:40:00 +0000 (UTC) (envelope-from ume@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n5IGe00l016954;
	Thu, 18 Jun 2009 16:40:00 GMT (envelope-from ume@svn.freebsd.org)
Received: (from ume@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n5IGe0fa016952;
	Thu, 18 Jun 2009 16:40:00 GMT (envelope-from ume@svn.freebsd.org)
Message-Id: <200906181640.n5IGe0fa016952@svn.freebsd.org>
From: Hajimu UMEMOTO <ume@FreeBSD.org>
Date: Thu, 18 Jun 2009 16:40:00 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r194447 - head/usr.bin/ncal
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
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/listinfo/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: Thu, 18 Jun 2009 16:40:01 -0000

Author: ume
Date: Thu Jun 18 16:40:00 2009
New Revision: 194447
URL: http://svn.freebsd.org/changeset/base/194447

Log:
  Since the width is always 2, it is enough to put just one
  trailing space is enough.
  
  MFC after:	1 week

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

Modified: head/usr.bin/ncal/ncal.c
==============================================================================
--- head/usr.bin/ncal/ncal.c	Thu Jun 18 15:57:57 2009	(r194446)
+++ head/usr.bin/ncal/ncal.c	Thu Jun 18 16:40:00 2009	(r194447)
@@ -844,7 +844,7 @@ mkweekdays(struct weekdays *wds)
 	for (i = 0; i != 7; i++) {
 		tm.tm_wday = (i+1) % 7;
 		wcsftime(buf, sizeof(buf), L"%a", &tm);
-		for (len = wcslen(buf); len > 0; --len) {
+		for (len = 2; len > 0; --len) {
 			if ((width = wcswidth(buf, len)) <= 2)
 				break;
 		}
@@ -852,7 +852,7 @@ mkweekdays(struct weekdays *wds)
 		if (width == 1)
 			wds->names[i][0] = L' ';
 		wcsncat(wds->names[i], buf, len);
-		wcsncat(wds->names[i], L"  ", 3 - wcswidth(wds->names[i], 2));
+		wcsncat(wds->names[i], L" ", 1);
 	}
 }