From owner-svn-src-head@freebsd.org  Wed Oct 28 13:30:24 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 B36BA446F56;
 Wed, 28 Oct 2020 13:30:24 +0000 (UTC) (envelope-from se@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (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 "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 4CLqFX4LDdz46gc;
 Wed, 28 Oct 2020 13:30:24 +0000 (UTC) (envelope-from se@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 73E6F1CFAD;
 Wed, 28 Oct 2020 13:30:24 +0000 (UTC) (envelope-from se@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 09SDUO9w052974;
 Wed, 28 Oct 2020 13:30:24 GMT (envelope-from se@FreeBSD.org)
Received: (from se@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id 09SDUOhX052973;
 Wed, 28 Oct 2020 13:30:24 GMT (envelope-from se@FreeBSD.org)
Message-Id: <202010281330.09SDUOhX052973@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: se set sender to se@FreeBSD.org
 using -f
From: =?UTF-8?Q?Stefan_E=c3=9fer?= <se@FreeBSD.org>
Date: Wed, 28 Oct 2020 13:30:24 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r367104 - head/usr.bin/calendar
X-SVN-Group: head
X-SVN-Commit-Author: se
X-SVN-Commit-Paths: head/usr.bin/calendar
X-SVN-Commit-Revision: 367104
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
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:30:24 -0000

Author: se
Date: Wed Oct 28 13:30:24 2020
New Revision: 367104
URL: https://svnweb.freebsd.org/changeset/base/367104

Log:
  Fix off-by-one error in processing of #ifdef lines
  
  The convention in this program is to parse the line immediately starting
  after the token (e.g. #defineA and #ifdefA define respectively look-up "A"),
  and this commit restores this behavior instead of skipping an assumed
  white-space character following #ifdef.
  
  Reported by:	kevans
  MFC after:	3 days

Modified:
  head/usr.bin/calendar/io.c

Modified: head/usr.bin/calendar/io.c
==============================================================================
--- head/usr.bin/calendar/io.c	Wed Oct 28 13:06:39 2020	(r367103)
+++ head/usr.bin/calendar/io.c	Wed Oct 28 13:30:24 2020	(r367104)
@@ -213,7 +213,7 @@ token(char *line, FILE *out, bool *skip)
 	}
 
 	if (strncmp(line, "ifdef", 5) == 0) {
-		walk = line + 6;
+		walk = line + 5;
 		trimlr(&walk);
 
 		if (*walk == '\0') {