Fix date and ical test cases

[lackey] / src / date.c

diff --git a/src/date.c b/src/date.c
index 22104967bc7c214738794926ffa6214bdfd1a920..4df8ce4241343cacbafe882f2b7d15ae5089724b 100644 (file)
--- a/src/date.c
+++ b/src/date.c
@@ -23,9 +23,8 @@
 #include "date.h"
 
 /* Global data */
-year_t  YEAR;
-month_t MONTH;
-day_t   DAY;
+date_t  NOW;
+date_t  SEL;
 
 /* Initialize */
 void date_init(void)
@@ -33,14 +32,22 @@ void date_init(void)
        time_t     sec = time(NULL);
        struct tm *tm  = localtime(&sec);
 
-       YEAR  = tm->tm_year+1900;
-       MONTH = tm->tm_mon;
-       DAY   = tm->tm_mday-1;
+       SEL.year  = tm->tm_year+1900;
+       SEL.month = tm->tm_mon;
+       SEL.day   = tm->tm_mday-1;
+}
+
+void date_sync(void)
+{
+       time_t     sec = time(NULL);
+       struct tm *tm  = localtime(&sec);
 
-       /* Testing */
-       //YEAR  = 2008;
-       //MONTH = OCT;
-       //DAY   = 21;
+       NOW.year  = tm->tm_year+1900;
+       NOW.month = tm->tm_mon;
+       NOW.day   = tm->tm_mday-1;
+       NOW.hour  = tm->tm_hour;
+       NOW.min   = tm->tm_min;
+       NOW.sec   = tm->tm_sec;
 }
 
 /* Time functions */
@@ -136,6 +143,13 @@ int compare(date_t *a, date_t *b)
        return rval;
 }
 
+int same_day(date_t *a, date_t *b)
+{
+       return a->year  == b->year  &&
+              a->month == b->month &&
+              a->day   == b->day;
+}
+
 int before(date_t *start, int year, int month, int day, int hour, int min)
 {
        return compare(start, &(date_t){year, month, day, hour, min}) < 0;
@@ -194,7 +208,7 @@ const char *day_to_string(wday_t day)
 void date_test(void)
 {
        printf("Info\n");
-       printf("  Year Month     Start Weeks Days\n");
+       printf("  Year   Month       Start   Weeks   Days\n");
        for (int y = 2012; y <= 2012; y++)
        for (int m = JAN;  m <= DEC;  m++) {
                printf("  %-5d",  y);