From owner-svn-src-head@freebsd.org  Tue May 17 06:07:42 2016
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@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 052C2B3E587;
 Tue, 17 May 2016 06:07:42 +0000 (UTC)
 (envelope-from truckman@FreeBSD.org)
Received: from gw.catspoiler.org (unknown [IPv6:2602:304:b010:ef20::f2])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client CN "gw.catspoiler.org", Issuer "gw.catspoiler.org" (not verified))
 by mx1.freebsd.org (Postfix) with ESMTPS id D7B1413A1;
 Tue, 17 May 2016 06:07:41 +0000 (UTC)
 (envelope-from truckman@FreeBSD.org)
Received: from FreeBSD.org (mousie.catspoiler.org [192.168.101.2])
 by gw.catspoiler.org (8.15.2/8.15.2) with ESMTP id u4H67VJL074016;
 Mon, 16 May 2016 23:07:35 -0700 (PDT)
 (envelope-from truckman@FreeBSD.org)
Message-Id: <201605170607.u4H67VJL074016@gw.catspoiler.org>
Date: Mon, 16 May 2016 23:07:31 -0700 (PDT)
From: Don Lewis <truckman@FreeBSD.org>
Subject: Re: svn commit: r300005 - head/usr.bin/ncal
To: cem@FreeBSD.org
cc: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
In-Reply-To: <CAG6CVpX-0dDZthcNQqzJrnafx-+hOkEKhKNGpu0noGqj__0jDQ@mail.gmail.com>
MIME-Version: 1.0
Content-Type: TEXT/plain; charset=us-ascii
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.22
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://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: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 17 May 2016 06:07:42 -0000

On 16 May, Conrad Meyer wrote:
> On Mon, May 16, 2016 at 10:05 PM, Don Lewis <truckman@freebsd.org> wrote:
>> Author: truckman
>> Date: Tue May 17 05:05:30 2016
>> New Revision: 300005
>> URL: https://svnweb.freebsd.org/changeset/base/300005
>>
>> Log:
>>   swprintf() and apparently wcsftime() want the their output buffer size
>>   specified in terms of the the number of wide characters and not
>>   sizeof(buffer).
>> ...
>> Modified: head/usr.bin/ncal/ncal.c
>> ==============================================================================
>> --- head/usr.bin/ncal/ncal.c    Tue May 17 04:53:21 2016        (r300004)
>> +++ head/usr.bin/ncal/ncal.c    Tue May 17 05:05:30 2016        (r300005)
>> @@ -642,8 +642,8 @@ monthrangeb(int y, int m, int jd_flag, i
>>                                 wprintf(L"%-*ls  ",
>>                                     mw, wcenter(ws, year[i].name, mw));
>>                         else {
>> -                               swprintf(ws, sizeof(ws), L"%-ls %d",
>> -                                   year[i].name, M2Y(m + i));
>> +                               swprintf(ws, sizeof(ws)/sizeof(ws[0]),
> 
> Normally we spell this nitems(ws).
> 
>> +                                   L"%-ls %d", year[i].name, M2Y(m + i));
>>                                 wprintf(L"%-*ls  ", mw, wcenter(ws1, ws, mw));
>>                         }
>>                 printf("\n");
>> @@ -958,7 +958,7 @@ mkweekdays(struct weekdays *wds)
>>
>>         for (i = 0; i != 7; i++) {
>>                 tm.tm_wday = (i+1) % 7;
>> -               wcsftime(buf, sizeof(buf), L"%a", &tm);
>> +               wcsftime(buf, sizeof(buf)/sizeof(buf[0]), L"%a", &tm);
> 
> This one can be nitems(buf) too.
> 
>>                 for (len = 2; len > 0; --len) {
>>                         if ((width = wcswidth(buf, len)) <= 2)
>>                                 break;
>>

I thought about that, but I didn't see any obvious signs that
<sys/param.h> was included.