[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.4 and 1.9

version 1.4, 1998/12/13 07:31:07 version 1.9, 2003/06/03 02:56:06
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 int bodun_always;
 extern time_t f_time;  extern time_t f_time;
 extern struct iovec header[];  extern struct iovec header[];
 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 58 
Line 56 
 struct match {  struct match {
         time_t  when;          time_t  when;
         char    print_date[30];          char    print_date[30];
           int     bodun;
         int     var;          int     var;
         struct match    *next;          struct match    *next;
 };  };
Line 67 
Line 66 
         int nlen;          int nlen;
         char *uname;          char *uname;
         int ulen;          int ulen;
         int (*getev) __P((int));          int (*getev)(int);
 };  };
   
 void     cal __P((void));  void     cal(void);
 void     closecal __P((FILE *));  void     closecal(FILE *);
 int      getday __P((char *));  int      getday(char *);
 int      getdayvar __P((char *));  int      getdayvar(char *);
 int      getfield __P((char *, char **, int *));  int      getfield(char *, char **, int *);
 int      getmonth __P((char *));  int      getmonth(char *);
 int      easter __P((int));  int      easter(int);
 int      paskha __P((int));  int      paskha(int);
 void     insert __P((struct event **, struct event *));  void     insert(struct event **, struct event *);
 struct match    *isnow __P((char *));  struct match    *isnow(char *, int);
 FILE    *opencal __P((void));  FILE    *opencal(void);
 void     settime __P((time_t *));  void     settime(time_t *);
 time_t   Mktime __P((char *));  time_t   Mktime(char *);
 void     usage __P((void));  void     usage(void);
 int      foy __P((int));  int      foy(int);
 void     variable_weekday __P((int *, int, int));  void     variable_weekday(int *, int, int);
 void     setnnames __P((void));  void     setnnames(void);
   
 /* some flags */  /* some flags */
 #define F_ISMONTH       0x01 /* month (Januar ...) */  #define F_ISMONTH       0x01 /* month (Januar ...) */
Line 108 
Line 107 
   
 #define NUMEV 2 /* Total number of such special events */  #define NUMEV 2 /* Total number of such special events */
 extern struct specialev spev[NUMEV];  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.4  
changed lines
  Added in v.1.9