From owner-svn-src-all@FreeBSD.ORG Sun Mar 15 09:12:45 2009 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7F4961065694 for ; Sun, 15 Mar 2009 09:12:45 +0000 (UTC) (envelope-from christoph.mallon@gmx.de) Received: from mail.gmx.net (mail.gmx.net [213.165.64.20]) by mx1.freebsd.org (Postfix) with SMTP id A04D48FC0A for ; Sun, 15 Mar 2009 09:12:43 +0000 (UTC) (envelope-from christoph.mallon@gmx.de) Received: (qmail invoked by alias); 15 Mar 2009 09:12:40 -0000 Received: from p54A3CD43.dip.t-dialin.net (EHLO tron.homeunix.org) [84.163.205.67] by mail.gmx.net (mp045) with SMTP; 15 Mar 2009 10:12:40 +0100 X-Authenticated: #1673122 X-Provags-ID: V01U2FsdGVkX1+wH+9wB2awW7oXJW5BbZ0O6u4Q4d31pKWkaRz+Eq t0B3MFZ+8VDctD Message-ID: <49BCC67D.70104@gmx.de> Date: Sun, 15 Mar 2009 10:12:29 +0100 From: Christoph Mallon User-Agent: Thunderbird 2.0.0.19 (X11/20090103) MIME-Version: 1.0 To: David Schultz References: <200903141855.n2EItpnp004551@svn.freebsd.org> In-Reply-To: <200903141855.n2EItpnp004551@svn.freebsd.org> Content-Type: multipart/mixed; boundary="------------000004040405050702070407" X-Y-GMX-Trusted: 0 X-FuHaFi: 0.5,0.52 Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org Subject: Re: svn commit: r189804 - head/usr.bin/ncal X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 15 Mar 2009 09:12:46 -0000 This is a multi-part message in MIME format. --------------000004040405050702070407 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit Hi David! David Schultz schrieb: > Author: das > Date: Sat Mar 14 18:55:51 2009 > New Revision: 189804 > URL: http://svn.freebsd.org/changeset/base/189804 > > Log: > Multibyte character support for cal(1). > > PR: 131578 > > Modified: > head/usr.bin/ncal/ncal.1 > head/usr.bin/ncal/ncal.c > [...] > Modified: head/usr.bin/ncal/ncal.c > ============================================================================== > --- head/usr.bin/ncal/ncal.c Sat Mar 14 18:24:15 2009 (r189803) > +++ head/usr.bin/ncal/ncal.c Sat Mar 14 18:55:51 2009 (r189804) [...] > @@ -532,17 +537,17 @@ printyearb(int y, int jd_flag) > printf("%s\n\n", center(t, s, mw * mpl + mpl)); > > for (j = 0; j != 12; j += mpl) { > - printf("%-*s ", mw, center(s, year[j].name, mw)); > + printf("%-*ls ", mw, wcenter(ws, year[j].name, mw)); > if (mpl == 2) > - printf("%s\n", center(s, year[j + 1].name, mw)); > + printf("%ls\n", wcenter(ws, year[j + 1].name, mw)); > else > - printf("%-*s %s\n", mw, > - center(s, year[j + 1].name, mw), > - center(t, year[j + 2].name, mw)); > + printf("%-*ls %ls\n", mw, > + wcenter(ws, year[j + 1].name, mw), > + wcenter(wt, year[j + 2].name, mw)); > > if (mpl == 2) > - printf(" %s %s %s %s %s %s %s " > - " %s %s %s %s %s %s %.2s\n", > + wprintf(L" %ls %ls %ls %ls %ls %ls %ls " > + " %ls %ls %ls %ls %ls %ls %.2ls\n", > wds.names[6], wds.names[0], wds.names[1], > wds.names[2], wds.names[3], wds.names[4], > wds.names[5], [...] Your changes to ncal are invalid. You are mixing byte and wide output functions, which access the same stream (here printf() and wprintf()). This is not allowed according to C99 ยง17.9.2:5: "Byte input/output functions shall not be applied to a wide-oriented stream and wide character input/output functions shall not be applied to a byte-oriented stream. [...]" (The first access of a stream with a byte/wide oriented function makes it byte/wide oriented) With FreeBSD's current implementation of output functions this accidently works, but you should not rely on this. For example with glibc's implementation it fails. Attached is a patch, which changes all wprintf()s back to printf(). Christoph --------------000004040405050702070407 Content-Type: text/plain; name="ncal.diff" Content-Transfer-Encoding: base64 Content-Disposition: inline; filename="ncal.diff" SW5kZXg6IG5jYWwuYwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBuY2FsLmMJKFJldmlzaW9uIDE4OTg0 NSkKKysrIG5jYWwuYwkoQXJiZWl0c2tvcGllKQpAQCAtNDQzLDE1ICs0NDMsMTUgQEAKIAlt dyA9IGpkX2ZsYWcgPyBNT05USF9XSURUSF9CX0ogOiBNT05USF9XSURUSF9COwogCiAJc3dw cmludGYocywgTUFYX1dJRFRILCBMIiVscyAlZCIsIG1vbnRoLm5hbWUsIHkpOwotCXdwcmlu dGYoTCIlbHNcbiIsIHdjZW50ZXIodCwgcywgbXcpKTsKKwlwcmludGYoIiVsc1xuIiwgd2Nl bnRlcih0LCBzLCBtdykpOwogCiAJaWYgKGpkX2ZsYWcpCi0JCXdwcmludGYoTCIgJWxzICVs cyAlbHMgJWxzICVscyAlbHMgJS4ybHNcbiIsCisJCXByaW50ZigiICVscyAlbHMgJWxzICVs cyAlbHMgJWxzICUuMmxzXG4iLAogCQkJd2RzLm5hbWVzWzZdLCB3ZHMubmFtZXNbMF0sCiAJ CQl3ZHMubmFtZXNbMV0sIHdkcy5uYW1lc1syXSwgd2RzLm5hbWVzWzNdLAogCQkJd2RzLm5h bWVzWzRdLCB3ZHMubmFtZXNbNV0pOwogCWVsc2UKLQkJd3ByaW50ZihMIiVscyVscyVscyVs cyVscyVscyUuMmxzXG4iLCB3ZHMubmFtZXNbNl0sCisJCXByaW50ZigiJWxzJWxzJWxzJWxz JWxzJWxzJS4ybHNcbiIsIHdkcy5uYW1lc1s2XSwKIAkJCXdkcy5uYW1lc1swXSwgd2RzLm5h bWVzWzFdLCB3ZHMubmFtZXNbMl0sIHdkcy5uYW1lc1szXSwKIAkJCXdkcy5uYW1lc1s0XSwg d2RzLm5hbWVzWzVdKTsKIApAQCAtNTQ2LDcgKzU0Niw3IEBACiAJCQkgICAgd2NlbnRlcih3 dCwgeWVhcltqICsgMl0ubmFtZSwgbXcpKTsKIAogCQlpZiAobXBsID09IDIpCi0JCQl3cHJp bnRmKEwiICVscyAlbHMgJWxzICVscyAlbHMgJWxzICVscyAiCisJCQlwcmludGYoIiAlbHMg JWxzICVscyAlbHMgJWxzICVscyAlbHMgIgogCQkJCSIgJWxzICVscyAlbHMgJWxzICVscyAl bHMgJS4ybHNcbiIsCiAJCQkJd2RzLm5hbWVzWzZdLCB3ZHMubmFtZXNbMF0sIHdkcy5uYW1l c1sxXSwKIAkJCQl3ZHMubmFtZXNbMl0sIHdkcy5uYW1lc1szXSwgd2RzLm5hbWVzWzRdLApA QCAtNTU1LDcgKzU1NSw3IEBACiAJCQkJd2RzLm5hbWVzWzJdLCB3ZHMubmFtZXNbM10sIHdk cy5uYW1lc1s0XSwKIAkJCQl3ZHMubmFtZXNbNV0pOwogCQllbHNlCi0JCQl3cHJpbnRmKEwi JWxzJWxzJWxzJWxzJWxzJWxzJWxzICIKKwkJCXByaW50ZigiJWxzJWxzJWxzJWxzJWxzJWxz JWxzICIKIAkJCQkiJWxzJWxzJWxzJWxzJWxzJWxzJWxzICIKIAkJCQkiJWxzJWxzJWxzJWxz JWxzJWxzJS4ybHNcbiIsCiAJCQkJd2RzLm5hbWVzWzZdLCB3ZHMubmFtZXNbMF0sIHdkcy5u YW1lc1sxXSwK --------------000004040405050702070407--