From owner-svn-src-head@FreeBSD.ORG  Tue Dec 10 01:39:22 2013
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id C307148E;
 Tue, 10 Dec 2013 01:39:22 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id AEEC91530;
 Tue, 10 Dec 2013 01:39:22 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBA1dMwn088862;
 Tue, 10 Dec 2013 01:39:22 GMT (envelope-from eadler@svn.freebsd.org)
Received: (from eadler@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBA1dMK3088861;
 Tue, 10 Dec 2013 01:39:22 GMT (envelope-from eadler@svn.freebsd.org)
Message-Id: <201312100139.rBA1dMK3088861@svn.freebsd.org>
From: Eitan Adler <eadler@FreeBSD.org>
Date: Tue, 10 Dec 2013 01:39:22 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r259152 - head/usr.bin/calendar
X-SVN-Group: head
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.17
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://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: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 10 Dec 2013 01:39:22 -0000

Author: eadler
Date: Tue Dec 10 01:39:22 2013
New Revision: 259152
URL: http://svnweb.freebsd.org/changeset/base/259152

Log:
  calendar(1): Add support for #include with absolute paths
  
  Prior to the addition of cpp support into calendar itself
  #include </usr/share/calendar/calendar.all>
  was a legal construction in a calendar file.
  
  Permit this again

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

Modified: head/usr.bin/calendar/calcpp.c
==============================================================================
--- head/usr.bin/calendar/calcpp.c	Tue Dec 10 00:35:33 2013	(r259151)
+++ head/usr.bin/calendar/calcpp.c	Tue Dec 10 01:39:22 2013	(r259152)
@@ -155,8 +155,11 @@ tokenscpp(char *buf, char *string)
 			s = p+1;
 			if ((p = strchr(s, '>')) != NULL)
 				*p = '\0';
-			snprintf (string, MAXPATHLEN, "%s/%s",
-				_PATH_INCLUDE, s);
+			if (*s != '/')
+				snprintf (string, MAXPATHLEN, "%s/%s",
+					_PATH_INCLUDE, s);
+			else
+				strncpy(string, s, MAXPATHLEN);
 		} else if (*p == '(') {
 			s = p+1;
 			if ((p = strchr(p, '>')) != NULL)