From owner-svn-src-head@freebsd.org Sun Dec 13 11:13:59 2020 Return-Path: Delivered-To: svn-src-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 5D7D54B5A01; Sun, 13 Dec 2020 11:13:59 +0000 (UTC) (envelope-from yuripv@yuripv.dev) Received: from out5-smtp.messagingengine.com (out5-smtp.messagingengine.com [66.111.4.29]) (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 4Cv22v1xKzz3jk1; Sun, 13 Dec 2020 11:13:58 +0000 (UTC) (envelope-from yuripv@yuripv.dev) Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailout.nyi.internal (Postfix) with ESMTP id 723C45C00B2; Sun, 13 Dec 2020 06:13:58 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute1.internal (MEProxy); Sun, 13 Dec 2020 06:13:58 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yuripv.dev; h= subject:to:references:from:message-id:date:mime-version :in-reply-to:content-type:content-transfer-encoding; s=fm1; bh=g jW+6Rh1/9DcMn4o598o4dji8cdP08/0mSzsfmyNnJI=; b=Znuec/CPdpoxk8nOc 2GiRDa8mBvP3XS8nudXpcJNjkQs7FVGGLsdwl+uM2hPao7OxW5QACL67sWbq08gk 2s3ikKNVsqtUa2D8AfDFLlZkrsq13cS1YG5bAACf57lyTbq9wbeSMKS72702asMl SvZMCyugRLT2TSlN8mGloF2x28i0CsVWt1BLqI1ga17X6TFl/jJ0CAJqelI+AR37 NbrqWT8NO/U9jwoJn6bfe/ERGz5CYSrRTAr0JB7bz2YgBwTDo1NB9cAr7VKjgICV bod6MI8dmNQvbNvpxLQNd6xxmGGX2tudHXPTx9Gq3xwEg8G+hvTHgJD0VwCscWyy GafWw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=content-transfer-encoding:content-type :date:from:in-reply-to:message-id:mime-version:references :subject:to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender :x-sasl-enc; s=fm1; bh=gjW+6Rh1/9DcMn4o598o4dji8cdP08/0mSzsfmyNn JI=; b=H/acdhAVomFd2KHSpnQore2x6jR2edsJQ9C8BY1IoHlC17OmLvhG8ziab y+/eSbVCT6OUWNUug6oKOYp2SdXgpNmLe+ssKkQoqFn+20A3acdFAl9NC2LXfIwt gv/29zd4U/hpYwuwf9X6/L1yXkyiSHgOcoy24ZvrKhr3+oPPNU6rHw7FvdC+6ydH ZOM5lEZevJWK0sPwign23JYQVU0UK+GfUcxS45s3ySzR14FZja1pvzvKXZK3ChOC AA9ElFbuYsrvn1oLXPkwRTJo6Qy49GoUuKk+0R88BW37H7pGF6ORvj1ld3rLkhDA bq/959LBXTqKUDVZaX2RaH9olWybA== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedujedrudekiedgvdekucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhepuffvfhfhkffffgggjggtgfesthekredttdefjeenucfhrhhomhepjghurhhi ucfrrghnkhhovhcuoeihuhhrihhpvheshihurhhiphhvrdguvghvqeenucggtffrrghtth gvrhhnpeevfeevgfetgfeukeefjeduueekffejuefgieetteeuledvtdethfelhedvjeet veenucffohhmrghinhepfhhrvggvsghsugdrohhrghenucfkphepledurddvgedtrdduvd egrdduheejnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhho mhephihurhhiphhvseihuhhrihhpvhdruggvvh X-ME-Proxy: Received: from [192.168.1.6] (unknown [91.240.124.157]) by mail.messagingengine.com (Postfix) with ESMTPA id 0876F240057; Sun, 13 Dec 2020 06:13:56 -0500 (EST) Subject: Re: svn commit: r368606 - head/usr.bin/calendar To: =?UTF-8?Q?Stefan_E=c3=9fer?= , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org References: <202012130938.0BD9cpTp041055@repo.freebsd.org> From: Yuri Pankov Message-ID: Date: Sun, 13 Dec 2020 14:13:55 +0300 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:78.0) Gecko/20100101 Thunderbird/78.5.1 MIME-Version: 1.0 In-Reply-To: <202012130938.0BD9cpTp041055@repo.freebsd.org> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 4Cv22v1xKzz3jk1 X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 13 Dec 2020 11:13:59 -0000 Stefan Eßer wrote: > Author: se > Date: Sun Dec 13 09:38:50 2020 > New Revision: 368606 > URL: https://svnweb.freebsd.org/changeset/base/368606 > > Log: > Fix WITHOUT_ICONV build > > There was an unprotected use of nl_langinfo() to determine the order of > day vs. month in the generated output. That's strange, nl_langinfo() is standard and its visibility should not (and does not?) depend on WITH/WITHOUT_ICONV. May be just move langinfo.h include outside of "#ifdef WITH_ICONV" block? > When building without ICONV support, the order will be: month, day. > > Modified: > head/usr.bin/calendar/events.c > > Modified: head/usr.bin/calendar/events.c > ============================================================================== > --- head/usr.bin/calendar/events.c Sun Dec 13 05:34:14 2020 (r368605) > +++ head/usr.bin/calendar/events.c Sun Dec 13 09:38:50 2020 (r368606) > @@ -202,9 +202,13 @@ event_print_all(FILE *fp) > struct event *e; > struct tm tm; > char dbuf[80]; > +#ifdef WITH_ICONV > static int d_first; > > d_first = (*nl_langinfo(D_MD_ORDER) == 'd'); > +#else > +#define d_first 0 > +#endif > > while (walkthrough_dates(&e) != 0) { > if (e) { >