[BACK]Return to calendar.h CVS log [TXT][DIR] Up to [local] / src / usr.bin / calendar

Diff for /src/usr.bin/calendar/calendar.h between version 1.3 and 1.14

version 1.3, 1998/11/08 04:31:13 version 1.14, 2015/03/15 00:41:28
Line 12 
Line 12 
  * 2. Redistributions in binary form must reproduce the above copyright   * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the   *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.   *    documentation and/or other materials provided with the distribution.
  * 3. All advertising materials mentioning features or use of this software   * 3. Neither the name of the University nor the names of its contributors
  *    must display the following acknowledgement:  
  *      This product includes software developed by the University of  
  *      California, Berkeley and its contributors.  
  * 4. Neither the name of the University nor the names of its contributors  
  *    may be used to endorse or promote products derived from this software   *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.   *    without specific prior written permission.
  *   *
Line 36 
Line 32 
   
 extern struct passwd *pw;  extern struct passwd *pw;
 extern int doall;  extern int doall;
 extern struct iovec header[];  extern int bodun_always;
   extern time_t f_time;
 extern struct tm *tp;  extern struct tm *tp;
 extern char *calendarFile;  extern char *calendarFile;
   extern char *calendarHome;
 extern char *optarg;  extern char *optarg;
   
 struct fixs {  struct fixs {
Line 49 
Line 47 
 struct event {  struct event {
         time_t  when;          time_t  when;
         char    print_date[31];          char    print_date[31];
         char    *desc;          char    **desc;
           char    *ldesc;
         struct event    *next;          struct event    *next;
 };  };
   
 struct match {  struct match {
         int year, month, day, var;          time_t  when;
         struct match *next;          char    print_date[30];
           int     bodun;
           int     var;
           struct match    *next;
 };  };
   
 void     cal __P((void));  struct specialev {
 void     closecal __P((FILE *));          char *name;
 int      getday __P((char *));          int nlen;
 int      getdayvar __P((char *));          char *uname;
 int      getfield __P((char *, char **, int *));          int ulen;
 int      getmonth __P((char *));          int (*getev)(int);
 int      geteaster __P((char *, int));  };
 int      getpaskha __P((char *, int));  
 int      easter __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));  
 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      pesach(int);
   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 */  /* some flags */
 #define F_ISMONTH       0x01 /* month (Januar ...) */  #define F_ISMONTH       0x01 /* month (Januar ...) */
 #define F_ISDAY         0x02 /* day of week (Sun, Mon, ...) */  #define F_ISDAY         0x02 /* day of week (Sun, Mon, ...) */
 #define F_ISDAYVAR      0x04 /* variables day of week, like SundayLast */  /*#define       F_ISDAYVAR      0x04  variables day of week, like SundayLast */
 #define F_EASTER        0x08 /* Easter or easter depending days */  #define F_SPECIAL       0x08 /* Events that occur once a year but don't track
                                 * calendar time--e.g.  Easter or easter depending
                                 * days */
   
   #define SECSPERDAY      (24 * 60 * 60)
   #define isleap(y) (((y) % 4) == 0 && (((y) % 100) != 0 || ((y) % 400) == 0))
   
 extern int f_dayAfter;  /* days after current date */  extern int f_dayAfter;  /* days after current date */
 extern int f_dayBefore; /* days before current date */  extern int f_dayBefore; /* days before current date */
   extern int f_SetdayAfter; /* calendar invoked with -A */
   
   /* Special events; see also setnnames() in day.c */
   /* '=' is not a valid character in a special event name */
   #define PESACH "pesach"
   #define PESACHLEN (sizeof(PESACH) - 1)
   #define EASTER "easter"
   #define EASTERNAMELEN (sizeof(EASTER) - 1)
   #define PASKHA "paskha"
   #define PASKHALEN (sizeof(PASKHA) - 1)
   
   /* calendars */
   extern enum calendars { GREGORIAN = 0, JULIAN, LUNAR } calendar;
   extern u_long julian;
   
   #define NUMEV 3 /* 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
Legend:
Removed from v.1.3  
changed lines
  Added in v.1.14