From owner-svn-src-all@freebsd.org Wed Oct 28 13:34:28 2020 Return-Path: Delivered-To: svn-src-all@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 E1923446D5C; Wed, 28 Oct 2020 13:34:28 +0000 (UTC) (envelope-from kevans@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 4CLqLD5bhtz47C6; Wed, 28 Oct 2020 13:34:28 +0000 (UTC) (envelope-from kevans@freebsd.org) Received: from mail-qv1-f51.google.com (mail-qv1-f51.google.com [209.85.219.51]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) (Authenticated sender: kevans) by smtp.freebsd.org (Postfix) with ESMTPSA id 9E4E818542; Wed, 28 Oct 2020 13:34:28 +0000 (UTC) (envelope-from kevans@freebsd.org) Received: by mail-qv1-f51.google.com with SMTP id f5so2361851qvx.6; Wed, 28 Oct 2020 06:34:28 -0700 (PDT) X-Gm-Message-State: AOAM533nWZ3p33jJsCHch2r8YMJRntxnpBAdpfIV6m5H7MxVmqIo/2ts Cb8LaThE0JHGaCL/T61DDhFpw/yXbjQATykgBus= X-Google-Smtp-Source: ABdhPJw2S3mHdo2bzSbTVQMGR6oZbHYnenAI/iJALi6TOZFJvnMZw/AOr9mhpKt0SNlkW8awcbqcaYDpWNwKZyKNhvg= X-Received: by 2002:a0c:bd85:: with SMTP id n5mr7487864qvg.22.1603892068014; Wed, 28 Oct 2020 06:34:28 -0700 (PDT) MIME-Version: 1.0 References: <202010281306.09SD6dgf040611@repo.freebsd.org> <784474fd-2f63-066c-eb86-cddfebd499cb@freebsd.org> In-Reply-To: <784474fd-2f63-066c-eb86-cddfebd499cb@freebsd.org> From: Kyle Evans Date: Wed, 28 Oct 2020 08:34:16 -0500 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: svn commit: r367103 - head/usr.bin/calendar To: Stefan Esser Cc: src-committers , svn-src-all , svn-src-head Content-Type: text/plain; charset="UTF-8" X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 28 Oct 2020 13:34:28 -0000 On Wed, Oct 28, 2020 at 8:24 AM Stefan Esser 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.