From owner-freebsd-current  Sat Jan  8 10:23:32 2000
Delivered-To: freebsd-current@freebsd.org
Received: from relay.nuxi.com (nuxi.cs.ucdavis.edu [169.237.7.38])
	by hub.freebsd.org (Postfix) with ESMTP id 3456B15747
	for <freebsd-current@FreeBSD.org>; Sat,  8 Jan 2000 10:23:30 -0800 (PST)
	(envelope-from obrien@NUXI.com)
Received: from dragon.nuxi.com (root@d60-025.leach.ucdavis.edu [169.237.60.25])
	by relay.nuxi.com (8.9.3/8.9.3) with ESMTP id KAA72905;
	Sat, 8 Jan 2000 10:23:13 -0800 (PST)
	(envelope-from obrien@dragon.nuxi.com)
Received: (from obrien@localhost)
	by dragon.nuxi.com (8.9.3/8.9.1) id KAA31708;
	Sat, 8 Jan 2000 10:23:12 -0800 (PST)
	(envelope-from obrien)
Date: Sat, 8 Jan 2000 10:23:12 -0800
From: "David O'Brien" <obrien@NUXI.com>
To: Brian Somers <brian@Awfulhak.org>
Cc: freebsd-current@FreeBSD.org, brian@hak.lan.Awfulhak.org
Subject: Re: hak.lan.Awfulhak.org daily run output
Message-ID: <20000108102312.I1417@dragon.nuxi.com>
Reply-To: obrien@NUXI.com
References: <root> <200001070832.IAA01463@hak.lan.Awfulhak.org>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
X-Mailer: Mutt 1.0i
In-Reply-To: <200001070832.IAA01463@hak.lan.Awfulhak.org>; from brian@Awfulhak.org on Fri, Jan 07, 2000 at 08:32:19AM +0000
X-Operating-System: FreeBSD 4.0-CURRENT
Organization: The NUXI BSD group
X-PGP-Fingerprint: B7 4D 3E E9 11 39 5F A3  90 76 5D 69 58 D9 98 7A
X-Pgp-Keyid: 34F9F9D5
Sender: owner-freebsd-current@FreeBSD.ORG
Precedence: bulk
X-Loop: FreeBSD.ORG

On Fri, Jan 07, 2000 at 08:32:19AM +0000, Brian Somers wrote:
> Anyone know what's changed with `calendar' ?  I suspect it's the 
> recent cpp changes.

Please test this patch.


Index: io.c
===================================================================
RCS file: /home/ncvs/src/usr.bin/calendar/io.c,v
retrieving revision 1.12
diff -u -r1.12 io.c
--- io.c	1999/08/28 00:59:17	1.12
+++ io.c	2000/01/08 18:22:00
@@ -274,7 +274,8 @@
 			warnx("setuid failed");
 			_exit(1);
 		}
-		execl(_PATH_CPP, "cpp", "-P", "-I.", _PATH_INCLUDE, NULL);
+		execl(_PATH_CPP, "cpp", "-traditional", "-P","-nostdinc",
+		    "-I.", _PATH_INCLUDE, NULL);
 		warn(_PATH_CPP);
 		_exit(1);
 	}
Index: pathnames.h
===================================================================
RCS file: /home/ncvs/src/usr.bin/calendar/pathnames.h,v
retrieving revision 1.2
diff -u -r1.2 pathnames.h
--- pathnames.h	1996/02/02 06:02:41	1.2
+++ pathnames.h	2000/01/08 18:21:01
@@ -35,7 +35,7 @@
 
 #include <paths.h>
 
-#define	_PATH_CPP	"/usr/bin/cpp"
+#define	_PATH_CPP	"/usr/libexec/cpp"
 
 			/* XXX -- fix when cpp parses arguments rationally */
 #define	_PATH_INCLUDE	"-I/usr/share/calendar"


To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-current" in the body of the message