From owner-svn-src-head@freebsd.org  Wed Oct 28 13:24:41 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 F18F2446EBB;
 Wed, 28 Oct 2020 13:24:41 +0000 (UTC) (envelope-from se@freebsd.org)
Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83])
 (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 "smtp.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 4CLq6x66kFz46Kw;
 Wed, 28 Oct 2020 13:24:41 +0000 (UTC) (envelope-from se@freebsd.org)
Received: from Stefans-MBP-WLAN.fritz.box
 (p200300cd5f0bbc00c5f6c550d2a7fd66.dip0.t-ipconnect.de
 [IPv6:2003:cd:5f0b:bc00:c5f6:c550:d2a7:fd66])
 (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
 (Client did not present a certificate)
 (Authenticated sender: se/mail)
 by smtp.freebsd.org (Postfix) with ESMTPSA id 1ED6218649;
 Wed, 28 Oct 2020 13:24:41 +0000 (UTC) (envelope-from se@freebsd.org)
To: Kyle Evans <kevans@freebsd.org>
Cc: src-committers <src-committers@freebsd.org>,
 svn-src-all <svn-src-all@freebsd.org>,
 svn-src-head <svn-src-head@freebsd.org>
References: <202010281306.09SD6dgf040611@repo.freebsd.org>
 <CACNAnaERLh7NvWQ45FZd_s94rApwzyDpah2APP3m=VbfBZrTgg@mail.gmail.com>
From: Stefan Esser <se@freebsd.org>
Subject: Re: svn commit: r367103 - head/usr.bin/calendar
Message-ID: <784474fd-2f63-066c-eb86-cddfebd499cb@freebsd.org>
Date: Wed, 28 Oct 2020 14:24:40 +0100
User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.16; rv:78.0)
 Gecko/20100101 Thunderbird/78.4.0
MIME-Version: 1.0
In-Reply-To: <CACNAnaERLh7NvWQ45FZd_s94rApwzyDpah2APP3m=VbfBZrTgg@mail.gmail.com>
Content-Type: text/plain; charset=utf-8; format=flowed
Content-Language: en-US
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.33
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: Wed, 28 Oct 2020 13:24:42 -0000

Am 28.10.20 um 14:12 schrieb Kyle Evans:>> Modified: 
head/usr.bin/calendar/io.c
>> ==============================================================================
>> --- head/usr.bin/calendar/io.c  Wed Oct 28 11:54:09 2020        (r367102)
>> +++ head/usr.bin/calendar/io.c  Wed Oct 28 13:06:39 2020        (r367103)
>> @@ -212,6 +212,21 @@ token(char *line, FILE *out, bool *skip)
>>                  return (T_OK);
>>          }
>>
>> +       if (strncmp(line, "ifdef", 5) == 0) {
>> +               walk = line + 6;
>> +               trimlr(&walk);
>> +
> 
> I think you wanted to step walk forward 5 instead of 6 here

Thank you for spotting this bug ...

It did not show up in my tests, since there generally is a blank
after the token, but I'll fix this immediately since I want to
MFC that change.

Nobody should be affected since #ifdef was officially unsupported
before this change ...

I'm thinking about support for nested conditionals and #else in
calendar files, but I'm not sure about the possibility to MFC
such a change and I do not want to invite users to create calendar
files that work in -CURRENT but not in -STABLE.