Use macros in advertise() to simplify source.

[nmh] / sbr / datetime.c

diff --git a/sbr/datetime.c b/sbr/datetime.c
index 34287b2331c54ca50f058b99a042719b3ffe64b0..fb7f7c296fc0d9a93222bf3dddc4bccf6087da2c 100644 (file)
--- a/sbr/datetime.c
+++ b/sbr/datetime.c
@@ -62,7 +62,10 @@ parse_datetime (const char *datetime, const char *zone, int dst,
                 struct tws *tws) {
     char utc_indicator;
     int form_1 = 0;
                 struct tws *tws) {
     char utc_indicator;
     int form_1 = 0;

-    int items_matched =
+    int items_matched;
+
+    memset(tws, 0, sizeof *tws);
+    items_matched =

         sscanf (datetime, "%4d%2d%2dT%2d%2d%2d%c",
                 &tws->tw_year, &tws->tw_mon, &tws->tw_mday,
                 &tws->tw_hour, &tws->tw_min, &tws->tw_sec,
         sscanf (datetime, "%4d%2d%2dT%2d%2d%2d%c",
                 &tws->tw_year, &tws->tw_mon, &tws->tw_mday,
                 &tws->tw_hour, &tws->tw_min, &tws->tw_sec,


@@ -80,12 +83,16 @@ parse_datetime (const char *datetime, const char *zone, int dst,
         form_1 = 1;
     }
 
         form_1 = 1;
     }
 

-    if (items_matched >= 6) {
+    /* items_matched of 3 is for, e.g., 20151230.  Assume that means
+       the entire day.  The time fields of the tws struct were
+       initialized to 0 by the memset() above. */
+    if (items_matched >= 6  ||  items_matched == 3) {

         int offset = atoi (zone ? zone : "0");
 
         /* struct tws defines tw_mon over [0, 11]. */
         --tws->tw_mon;
 
         int offset = atoi (zone ? zone : "0");
 
         /* struct tws defines tw_mon over [0, 11]. */
         --tws->tw_mon;
 

+        /* Fill out rest of tws, i.e., its tw_wday and tw_flags. */

         set_dotw (tws);
         /* set_dotw() sets TW_SIMP.  Replace that with TW_SEXP so that
            dasctime() outputs the dotw before the date instead of after. */
         set_dotw (tws);
         /* set_dotw() sets TW_SIMP.  Replace that with TW_SEXP so that
            dasctime() outputs the dotw before the date instead of after. */


@@ -136,9 +143,9 @@ parse_datetime (const char *datetime, const char *zone, int dst,
         }
 
         return OK;
         }
 
         return OK;

-    } else {
-        return NOTOK;

     }
     }

+
+    return NOTOK;

 }
 
 tzdesc_t
 }
 
 tzdesc_t


@@ -210,7 +217,7 @@ load_timezones (const contentline *clines) {
                 ! strcasecmp ("VTIMEZONE", node->value)) {
 
                 in_vtimezone = 1;
                 ! strcasecmp ("VTIMEZONE", node->value)) {
 
                 in_vtimezone = 1;

-                timezone = mh_xcalloc (1, sizeof (struct tzdesc));
+                NEW0(timezone);

                 if (timezones) {
                     tzdesc_t t;
 
                 if (timezones) {
                     tzdesc_t t;
 


@@ -262,7 +269,8 @@ rrule_clock (const char *rrule, const char *starttime, const char *zone,
              unsigned int year) {
     time_t clock = 0;
 
              unsigned int year) {
     time_t clock = 0;
 

-    if (nmh_strcasestr (rrule, "FREQ=YEARLY;INTERVAL=1")) {
+    if (nmh_strcasestr (rrule, "FREQ=YEARLY;INTERVAL=1")  ||
+        (nmh_strcasestr (rrule, "FREQ=YEARLY")  &&  nmh_strcasestr(rrule, "INTERVAL") == NULL)) {

         struct tws *tws;
         const char *cp;
         int wday = -1, month = -1;
         struct tws *tws;
         const char *cp;
         int wday = -1, month = -1;


@@ -351,10 +359,9 @@ format_datetime (tzdesc_t timezones, const contentline *node) {
            Form #2: DATE WITH UTC TIME */
         if (parse_datetime (node->value, NULL, 0, &tws[0]) == OK) {
             return strdup (dasctime (&tws[0], 0));
            Form #2: DATE WITH UTC TIME */
         if (parse_datetime (node->value, NULL, 0, &tws[0]) == OK) {
             return strdup (dasctime (&tws[0], 0));

-        } else {
-            advise (NULL, "unable to parse datetime %s", node->value);
-            return NULL;

         }
         }

+        advise (NULL, "unable to parse datetime %s", node->value);
+        return NULL;

     }
 
     /*
     }
 
     /*