From owner-svn-src-user@FreeBSD.ORG  Wed Mar  3 21:14:12 2010
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id C8263106566C;
	Wed,  3 Mar 2010 21:14:12 +0000 (UTC)
	(envelope-from edwin@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id B84738FC0A;
	Wed,  3 Mar 2010 21:14:12 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o23LECg5067349;
	Wed, 3 Mar 2010 21:14:12 GMT (envelope-from edwin@svn.freebsd.org)
Received: (from edwin@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o23LECr2067347;
	Wed, 3 Mar 2010 21:14:12 GMT (envelope-from edwin@svn.freebsd.org)
Message-Id: <201003032114.o23LECr2067347@svn.freebsd.org>
From: Edwin Groothuis <edwin@FreeBSD.org>
Date: Wed, 3 Mar 2010 21:14:12 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r204663 - user/edwin/ncal
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 03 Mar 2010 21:14:12 -0000

Author: edwin
Date: Wed Mar  3 21:14:12 2010
New Revision: 204663
URL: http://svn.freebsd.org/changeset/base/204663

Log:
  Fix the center alignment of month heading in the backwards compatibility mode.

Modified:
  user/edwin/ncal/ncal.c

Modified: user/edwin/ncal/ncal.c
==============================================================================
--- user/edwin/ncal/ncal.c	Wed Mar  3 21:10:13 2010	(r204662)
+++ user/edwin/ncal/ncal.c	Wed Mar  3 21:14:12 2010	(r204663)
@@ -490,7 +490,7 @@ monthrangeb(int y, int jd_flag, int m, i
 	struct monthlines year[12];
 	struct weekdays wds;
 	char	s[80], t[80];
-	wchar_t	ws[80];
+	wchar_t	ws[80], ws1[80];
 	const char	*wdss;
 	int     i, j;
 	int     mpl;
@@ -544,10 +544,11 @@ monthrangeb(int y, int jd_flag, int m, i
 			if (printyearheader)
 				wprintf(L"%-*ls  ",
 				    mw, wcenter(ws, year[i].name, mw));
-			else
-				wprintf(L"%-ls %-*d  ",
-				    wcenter(ws, year[i].name, mw - 10),
-				    mw - wcslen(year[i].name) - 1, M2Y(m + i));
+			else {
+				swprintf(ws, sizeof(ws), L"%-ls %d",
+				    year[i].name, M2Y(m + i));
+				wprintf(L"%-*ls  ", mw, wcenter(ws1, ws, mw));
+			}
 		printf("\n");
 
 		/* Day of the week names */