Date: Wed, 28 Oct 2020 14:24:40 +0100 From: Stefan Esser <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> Subject: Re: svn commit: r367103 - head/usr.bin/calendar Message-ID: <784474fd-2f63-066c-eb86-cddfebd499cb@freebsd.org> In-Reply-To: <CACNAnaERLh7NvWQ45FZd_s94rApwzyDpah2APP3m=VbfBZrTgg@mail.gmail.com> References: <202010281306.09SD6dgf040611@repo.freebsd.org> <CACNAnaERLh7NvWQ45FZd_s94rApwzyDpah2APP3m=VbfBZrTgg@mail.gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
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.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?784474fd-2f63-066c-eb86-cddfebd499cb>