svn commit: r367103 - head/usr.bin/calendar

[Stefan Esser]

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.