===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/calendar/calendar.h,v
retrieving revision 1.2
retrieving revision 1.6
diff -u -r1.2 -r1.6
--- src/usr.bin/calendar/calendar.h	1998/03/30 06:59:24	1.2
+++ src/usr.bin/calendar/calendar.h	2001/09/26 20:38:55	1.6
@@ -1,4 +1,4 @@
-/*	$OpenBSD: calendar.h,v 1.2 1998/03/30 06:59:24 deraadt Exp $	*/
+/*	$OpenBSD: calendar.h,v 1.6 2001/09/26 20:38:55 mickey Exp $	*/
 
 /*
  * Copyright (c) 1989, 1993, 1994
@@ -36,37 +36,84 @@
 
 extern struct passwd *pw;
 extern int doall;
+extern int bodun_always;
+extern time_t f_time;
 extern struct iovec header[];
 extern struct tm *tp;
 extern char *calendarFile;
+extern char *calendarHome;
 extern char *optarg;
 
+struct fixs {
+	char *name;
+	int len;
+};
+
+struct event {
+	time_t	when;
+	char	print_date[31];
+	char	**desc;
+	char	*ldesc;
+	struct event	*next;
+};
+
+struct match {
+	time_t	when;
+	char	print_date[30];
+	char	prefix[30];
+	int	var;
+	struct match	*next;
+};
+
+struct specialev {
+	char *name;
+	int nlen;
+	char *uname;
+	int ulen;
+	int (*getev) __P((int));
+};
+
 void	 cal __P((void));
 void	 closecal __P((FILE *));
 int	 getday __P((char *));
 int	 getdayvar __P((char *));
 int	 getfield __P((char *, char **, int *));
 int	 getmonth __P((char *));
-int	 geteaster __P((char *, int));
-int      getpaskha __P((char *, int));
-int      easter __P((int));
-int	 isnow __P((char *, int *, int *, int *));
+int	 easter __P((int));
+int	 paskha __P((int));
+void	 insert __P((struct event **, struct event *));
+struct match	*isnow __P((char *, int));
 FILE	*opencal __P((void));
-void	 settime __P((time_t));
-time_t   Mktime __P((char *));
+void	 settime __P((time_t *));
+time_t	 Mktime __P((char *));
 void	 usage __P((void));
-void     setnnames __P((void));
+int	 foy __P((int));
+void	 variable_weekday __P((int *, int, int));
+void	 setnnames __P((void));
 
 /* some flags */
 #define	F_ISMONTH	0x01 /* month (Januar ...) */
 #define	F_ISDAY		0x02 /* day of week (Sun, Mon, ...) */
-#define	F_ISDAYVAR	0x04 /* variables day of week, like SundayLast */
-#define	F_EASTER	0x08 /* Easter or easter depending days */
+/*#define	F_ISDAYVAR	0x04  variables day of week, like SundayLast */
+#define	F_SPECIAL	0x08 /* Events that occur once a year but don't track
+			      * calendar time--e.g.  Easter or easter depending
+			      * days */
 
 extern int f_dayAfter;	/* days after current date */
 extern int f_dayBefore;	/* days before current date */
 
-struct fixs {
-	char *name;
-	int len;
-};
+/* Special events; see also setnnames() in day.c */
+/* '=' is not a valid character in a special event name */
+#define EASTER "easter"
+#define EASTERNAMELEN (sizeof(EASTER) - 1)
+#define PASKHA "paskha"
+#define PASKHALEN (sizeof(PASKHA) - 1)
+
+#define NUMEV 2	/* Total number of such special events */
+extern struct specialev spev[NUMEV];
+
+/* For calendar -a, specify a maximum time (in seconds) to spend parsing
+ * each user's calendar files.  This prevents them from hanging calendar
+ * (e.g. by using named pipes)
+ */
+#define USERTIMEOUT 20