D26882.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D26882.diff
View Options

	Index: head/include/paths.h
	===================================================================
	--- head/include/paths.h
	+++ head/include/paths.h
	@@ -37,8 +37,11 @@

	#include <sys/cdefs.h>

	+#define _PATH_LOCALBASE "/usr/local"
	+
	/* Default search path. */
	-#define _PATH_DEFPATH "/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin"
	+#define _PATH_DEFPATH "/sbin:/bin:/usr/sbin:/usr/bin:" \
	+ _PATH_LOCALBASE "/sbin:" _PATH_LOCALBASE "/bin"
	/* All standard utilities path. */
	#define _PATH_STDPATH "/usr/bin:/bin:/usr/sbin:/sbin"
	/* Locate system binaries. */
	Index: head/usr.bin/calendar/io.c
	===================================================================
	--- head/usr.bin/calendar/io.c
	+++ head/usr.bin/calendar/io.c
	@@ -71,7 +71,7 @@
	};

	const char calendarFile = "calendar"; / default calendar file */
	-static const char calendarHomes[] = {".calendar", _PATH_INCLUDE}; / HOME */
	+static const char calendarHomes[] = {".calendar", _PATH_INCLUDE_LOCAL, _PATH_INCLUDE}; / HOME */
	static const char calendarNoMail = "nomail";/ don't sent mail if file exist */

	static char path[MAXPATHLEN];
	Index: head/usr.bin/calendar/pathnames.h
	===================================================================
	--- head/usr.bin/calendar/pathnames.h
	+++ head/usr.bin/calendar/pathnames.h
	@@ -35,3 +35,4 @@
	#include <paths.h>

	#define _PATH_INCLUDE "/usr/share/calendar"
	+#define _PATH_INCLUDE_LOCAL _PATH_LOCALBASE "/share/calendar"