From owner-svn-src-head@freebsd.org  Sun Dec 13 09:38:51 2020
Return-Path: <owner-svn-src-head@freebsd.org>
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 7DFE34B39B3;
 Sun, 13 Dec 2020 09:38:51 +0000 (UTC) (envelope-from se@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
 key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256
 client-signature RSA-PSS (4096 bits) client-digest SHA256)
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 4Ctzx734lCz3Nrs;
 Sun, 13 Dec 2020 09:38:51 +0000 (UTC) (envelope-from se@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 5CA925562;
 Sun, 13 Dec 2020 09:38:51 +0000 (UTC) (envelope-from se@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0BD9cplp041056;
 Sun, 13 Dec 2020 09:38:51 GMT (envelope-from se@FreeBSD.org)
Received: (from se@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0BD9cpTp041055;
 Sun, 13 Dec 2020 09:38:51 GMT (envelope-from se@FreeBSD.org)
Message-Id: <202012130938.0BD9cpTp041055@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: se set sender to se@FreeBSD.org
 using -f
From: =?UTF-8?Q?Stefan_E=c3=9fer?= <se@FreeBSD.org>
Date: Sun, 13 Dec 2020 09:38:51 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r368606 - head/usr.bin/calendar
X-SVN-Group: head
X-SVN-Commit-Author: se
X-SVN-Commit-Paths: head/usr.bin/calendar
X-SVN-Commit-Revision: 368606
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
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
 <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: Sun, 13 Dec 2020 09:38:51 -0000

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.
  
  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) {