===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/calendar/calendar.h,v
retrieving revision 1.4
retrieving revision 1.8
diff -u -r1.4 -r1.8
--- src/usr.bin/calendar/calendar.h	1998/12/13 07:31:07	1.4
+++ src/usr.bin/calendar/calendar.h	2002/02/16 21:27:44	1.8
@@ -1,4 +1,4 @@
-/*	$OpenBSD: calendar.h,v 1.4 1998/12/13 07:31:07 pjanzen Exp $	*/
+/*	$OpenBSD: calendar.h,v 1.8 2002/02/16 21:27:44 millert Exp $	*/
 
 /*
  * Copyright (c) 1989, 1993, 1994
@@ -36,10 +36,12 @@
 
 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 {
@@ -58,6 +60,7 @@
 struct match {
 	time_t	when;
 	char	print_date[30];
+	int	bodun;
 	int	var;
 	struct match	*next;
 };
@@ -67,26 +70,26 @@
 	int nlen;
 	char *uname;
 	int ulen;
-	int (*getev) __P((int));
+	int (*getev)(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	 easter __P((int));
-int	 paskha __P((int));
-void	 insert __P((struct event **, struct event *));
-struct match	*isnow __P((char *));
-FILE	*opencal __P((void));
-void	 settime __P((time_t *));
-time_t	 Mktime __P((char *));
-void	 usage __P((void));
-int	 foy __P((int));
-void	 variable_weekday __P((int *, int, int));
-void	 setnnames __P((void));
+void	 cal(void);
+void	 closecal(FILE *);
+int	 getday(char *);
+int	 getdayvar(char *);
+int	 getfield(char *, char **, int *);
+int	 getmonth(char *);
+int	 easter(int);
+int	 paskha(int);
+void	 insert(struct event **, struct event *);
+struct match	*isnow(char *, int);
+FILE	*opencal(void);
+void	 settime(time_t *);
+time_t	 Mktime(char *);
+void	 usage(void);
+int	 foy(int);
+void	 variable_weekday(int *, int, int);
+void	 setnnames(void);
 
 /* some flags */
 #define	F_ISMONTH	0x01 /* month (Januar ...) */
@@ -108,3 +111,9 @@
 
 #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