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

[Kyle Evans]

On Wed, Oct 28, 2020 at 8:24 AM Stefan Esser <se at freebsd.org> wrote:
>
> 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 ...
>

+1, thanks!

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

Unsolicited $0.02: Do whatever you feel comfortable with. It's up to
people trying to use the new/advanced features to make sure it's
compatible with the calendar(1) that *they* are using, and I'm having
a hard time imagining folks using deploying additional calendar data
in ports outside of deskutils/calendar-data which you can curate for
stuff like that.