Merge pull request #4736 from dobyrch/calendar-cleanup

calendarspec: miscellaneous parsing and formatting fixes

3 files changed, 91 insertions, 46 deletions

diff --git a/man/systemd.time.xml b/man/systemd.time.xml
index fb13ea52ff..c182d4f37a 100644
--- a/man/systemd.time.xml
+++ b/man/systemd.time.xml
@@ -273,7 +273,7 @@ Wed..Sat,Tue 12-10-15 1:2:3 → Tue..Sat 2012-10-15 01:02:03
         monday *-12-* 17:00 → Mon *-12-* 17:00:00
   Mon,Fri *-*-3,1,2 *:30:45 → Mon,Fri *-*-01,02,03 *:30:45
        12,14,13,12:20,10,30 → *-*-* 12,13,14:10,20,30:00
-            12..14:10,20,30 → *-*-* 12,13,14:10,20,30:00
+            12..14:10,20,30 → *-*-* 12..14:10,20,30:00
   mon,fri *-1/2-1,3 *:30:45 → Mon,Fri *-01/2-01,03 *:30:45
              03-05 08:05:40 → *-03-05 08:05:40
                    08:05:40 → *-*-* 08:05:40
@@ -282,7 +282,7 @@ Wed..Sat,Tue 12-10-15 1:2:3 → Tue..Sat 2012-10-15 01:02:03
            Sat,Sun 08:05:40 → Sat,Sun *-*-* 08:05:40
            2003-03-05 05:40 → 2003-03-05 05:40:00
  05:40:23.4200004/3.1700005 → 05:40:23.420000/3.170001
-             2003-02..04-05 → 2003-02,03,04-05 00:00:00
+             2003-02..04-05 → 2003-02..04-05 00:00:00
        2003-03-05 05:40 UTC → 2003-03-05 05:40:00 UTC
                  2003-03-05 → 2003-03-05 00:00:00
                       03-05 → *-03-05 00:00:00
diff --git a/src/basic/calendarspec.c b/src/basic/calendarspec.c
index 359bb16cae..8b57de4744 100644
--- a/src/basic/calendarspec.c
+++ b/src/basic/calendarspec.c
@@ -18,6 +18,7 @@
 ***/
 
 #include <alloca.h>
+#include <ctype.h>
 #include <errno.h>
 #include <stddef.h>
 #include <stdio.h>
@@ -152,7 +153,7 @@ int calendar_spec_normalize(CalendarSpec *c) {
         return 0;
 }
 
-_pure_ static bool chain_valid(CalendarComponent *c, int from, int to, bool eom) {
+_pure_ static bool chain_valid(CalendarComponent *c, int from, int to, bool end_of_month) {
         if (!c)
                 return true;
 
@@ -162,17 +163,17 @@ _pure_ static bool chain_valid(CalendarComponent *c, int from, int to, bool eom)
         /*
          * c->repeat must be short enough so at least one repetition may
          * occur before the end of the interval.  For dates scheduled
-         * relative to the end of the month (eom), c->value corresponds
-         * to the Nth last day of the month.
+         * relative to the end of the month, c->value corresponds to the
+         * Nth last day of the month.
          */
-        if (eom && c->value - c->repeat < from)
+        if (end_of_month && c->value - c->repeat < from)
                 return false;
 
-        if (!eom && c->value + c->repeat > to)
+        if (!end_of_month && c->value + c->repeat > to)
                 return false;
 
         if (c->next)
-                return chain_valid(c->next, from, to, eom);
+                return chain_valid(c->next, from, to, end_of_month);
 
         return true;
 }
@@ -254,6 +255,9 @@ static void format_weekdays(FILE *f, const CalendarSpec *c) {
 }
 
 static void format_chain(FILE *f, int space, const CalendarComponent *c, bool usec) {
+        const CalendarComponent *n, *p;
+        int d = usec ? (int) USEC_PER_SEC : 1;
+
         assert(f);
 
         if (!c) {
@@ -262,29 +266,40 @@ static void format_chain(FILE *f, int space, const CalendarComponent *c, bool us
         }
 
         assert(c->value >= 0);
-        if (!usec)
-                fprintf(f, "%0*i", space, c->value);
-        else if (c->value % USEC_PER_SEC == 0)
-                fprintf(f, "%0*i", space, (int) (c->value / USEC_PER_SEC));
-        else
-                fprintf(f, "%0*i.%06i", space, (int) (c->value / USEC_PER_SEC), (int) (c->value % USEC_PER_SEC));
-
-        if (c->repeat > 0) {
-                if (!usec)
-                        fprintf(f, "/%i", c->repeat);
-                else if (c->repeat % USEC_PER_SEC == 0)
-                        fprintf(f, "/%i", (int) (c->repeat / USEC_PER_SEC));
-                else
-                        fprintf(f, "/%i.%06i", (int) (c->repeat / USEC_PER_SEC), (int) (c->repeat % USEC_PER_SEC));
+
+        fprintf(f, "%0*i", space, c->value / d);
+        if (c->value % d != 0)
+                fprintf(f, ".%06i", c->value % d);
+
+        if (c->repeat != 0)
+                fprintf(f, "/%i", c->repeat / d);
+        if (c->repeat % d != 0)
+                fprintf(f, ".%06i", c->repeat % d);
+
+        p = c;
+        for (;;) {
+                n = p->next;
+
+                if (!n || n->repeat || p->repeat)
+                        break;
+
+                if (n->value - p->value != d)
+                       break;
+
+                p = n;
         }
 
-        if (c->next) {
+        if (p->value - c->value >= 2 * d) {
+                fputs("..", f);
+                format_chain(f, space, p, usec);
+        } else if (c->next) {
                 fputc(',', f);
                 format_chain(f, space, c->next, usec);
         }
 }
 
 int calendar_spec_to_string(const CalendarSpec *c, char **p) {
+        CalendarComponent *cc;
         char *buf = NULL;
         size_t sz = 0;
         FILE *f;
@@ -312,7 +327,12 @@ int calendar_spec_to_string(const CalendarSpec *c, char **p) {
         fputc(':', f);
         format_chain(f, 2, c->minute, false);
         fputc(':', f);
-        format_chain(f, 2, c->microsecond, true);
+
+        cc = c->microsecond;
+        if (cc && !cc->value && cc->repeat == USEC_PER_SEC && !cc->next)
+                fputc('*', f);
+        else
+                format_chain(f, 2, c->microsecond, true);
 
         if (c->utc)
                 fputs(" UTC", f);
@@ -372,9 +392,6 @@ static int parse_weekdays(const char **p, CalendarSpec *c) {
         for (;;) {
                 unsigned i;
 
-                if (!first && **p == ' ')
-                        return 0;
-
                 for (i = 0; i < ELEMENTSOF(day_nr); i++) {
                         size_t skip;
 
@@ -430,7 +447,7 @@ static int parse_weekdays(const char **p, CalendarSpec *c) {
                                 return -EINVAL;
 
                         l = day_nr[i].nr;
-                        *p += 1;
+                        *p += 2;
 
                 /* Support ranges with "-" for backwards compatibility */
                 } else if (**p == '-') {
@@ -438,10 +455,19 @@ static int parse_weekdays(const char **p, CalendarSpec *c) {
                                 return -EINVAL;
 
                         l = day_nr[i].nr;
-                } else
+                        *p += 1;
+
+                } else if (**p == ',') {
                         l = -1;
+                        *p += 1;
+                }
+
+                /* Allow  a trailing comma but not an open range */
+                if (**p == 0 || **p == ' ') {
+                        *p += strspn(*p, " ");
+                        return l < 0 ? 0 : -EINVAL;
+                }
 
-                *p += 1;
                 first = false;
         }
 }
@@ -452,6 +478,9 @@ static int parse_component_decimal(const char **p, bool usec, unsigned long *res
         char *ee = NULL;
         int r;
 
+        if (!isdigit(**p))
+                return -EINVAL;
+
         errno = 0;
         value = strtoul(*p, &ee, 10);
         if (errno > 0)
@@ -470,6 +499,10 @@ static int parse_component_decimal(const char **p, bool usec, unsigned long *res
                 if (*e == '.') {
                         unsigned add;
 
+                        /* This is the start of a range, not a fractional part */
+                        if (e[1] == '.')
+                                goto finish;
+
                         e++;
                         r = parse_fractional_part_u(&e, 6, &add);
                         if (r < 0)
@@ -481,6 +514,7 @@ static int parse_component_decimal(const char **p, bool usec, unsigned long *res
                 }
         }
 
+finish:
         *p = e;
         *res = value;
 
@@ -699,14 +733,9 @@ static int parse_calendar_time(const char **p, CalendarSpec *c) {
 
         t = *p;
 
-        if (*t == 0) {
-                /* If no time is specified at all, but a date of some
-                 * kind, then this means 00:00:00 */
-                if (c->day || c->weekdays_bits > 0)
-                        goto null_hour;
-
-                goto finish;
-        }
+        /* If no time is specified at all, then this means 00:00:00 */
+        if (*t == 0)
+                goto null_hour;
 
         r = parse_chain(&t, false, &h);
         if (r < 0)
@@ -784,9 +813,6 @@ int calendar_spec_from_string(const char *p, CalendarSpec **spec) {
         assert(p);
         assert(spec);
 
-        if (isempty(p))
-                return -EINVAL;
-
         c = new0(CalendarSpec, 1);
         if (!c)
                 return -ENOMEM;
@@ -825,6 +851,11 @@ int calendar_spec_from_string(const char *p, CalendarSpec **spec) {
                 }
         }
 
+        if (isempty(p)) {
+                r = -EINVAL;
+                goto fail;
+        }
+
         if (strcaseeq(p, "minutely")) {
                 r = const_chain(0, &c->microsecond);
                 if (r < 0)
diff --git a/src/test/test-calendarspec.c b/src/test/test-calendarspec.c
index 76f5819bb9..b3d1160ea7 100644
--- a/src/test/test-calendarspec.c
+++ b/src/test/test-calendarspec.c
@@ -143,13 +143,14 @@ int main(int argc, char* argv[]) {
         test_one("Wed-Wed,Wed *-1", "Wed *-*-01 00:00:00");
         test_one("Wed..Wed,Wed *-1", "Wed *-*-01 00:00:00");
         test_one("Wed, 17:48", "Wed *-*-* 17:48:00");
+        test_one("Wednesday,", "Wed *-*-* 00:00:00");
         test_one("Wed-Sat,Tue 12-10-15 1:2:3", "Tue..Sat 2012-10-15 01:02:03");
         test_one("Wed..Sat,Tue 12-10-15 1:2:3", "Tue..Sat 2012-10-15 01:02:03");
         test_one("*-*-7 0:0:0", "*-*-07 00:00:00");
         test_one("10-15", "*-10-15 00:00:00");
         test_one("monday *-12-* 17:00", "Mon *-12-* 17:00:00");
-        test_one("Mon,Fri *-*-3,1,2 *:30:45", "Mon,Fri *-*-01,02,03 *:30:45");
-        test_one("12,14,13,12:20,10,30", "*-*-* 12,13,14:10,20,30:00");
+        test_one("Mon,Fri *-*-3,1,2 *:30:45", "Mon,Fri *-*-01..03 *:30:45");
+        test_one("12,14,13,12:20,10,30", "*-*-* 12..14:10,20,30:00");
         test_one("mon,fri *-1/2-1,3 *:30:45", "Mon,Fri *-01/2-01,03 *:30:45");
         test_one("03-05 08:05:40", "*-03-05 08:05:40");
         test_one("08:05:40", "*-*-* 08:05:40");
@@ -172,13 +173,19 @@ int main(int argc, char* argv[]) {
         test_one("2016-03-27 03:17:00.4200005", "2016-03-27 03:17:00.420001");
         test_one("2016-03-27 03:17:00/0.42", "2016-03-27 03:17:00/0.420000");
         test_one("2016-03-27 03:17:00/0.42", "2016-03-27 03:17:00/0.420000");
-        test_one("9..11,13:00,30", "*-*-* 09,10,11,13:00,30:00");
-        test_one("1..3-1..3 1..3:1..3", "*-01,02,03-01,02,03 01,02,03:01,02,03:00");
+        test_one("9..11,13:00,30", "*-*-* 09..11,13:00,30:00");
+        test_one("1..3-1..3 1..3:1..3", "*-01..03-01..03 01..03:01..03:00");
         test_one("00:00:1.125..2.125", "*-*-* 00:00:01.125000,02.125000");
-        test_one("00:00:1.0..3.8", "*-*-* 00:00:01,02,03");
+        test_one("00:00:1.0..3.8", "*-*-* 00:00:01..03");
+        test_one("00:00:01..03", "*-*-* 00:00:01..03");
+        test_one("00:00:01/2,02..03", "*-*-* 00:00:01/2,02,03");
         test_one("*-*~1 Utc", "*-*~01 00:00:00 UTC");
         test_one("*-*~05,3 ", "*-*~03,05 00:00:00");
         test_one("*-*~* 00:00:00", "*-*-* 00:00:00");
+        test_one("Monday", "Mon *-*-* 00:00:00");
+        test_one("Monday *-*-*", "Mon *-*-* 00:00:00");
+        test_one("*-*-*", "*-*-* 00:00:00");
+        test_one("*:*:*", "*-*-* *:*:*");
 
         test_next("2016-03-27 03:17:00", "", 12345, 1459048620000000);
         test_next("2016-03-27 03:17:00", "CET", 12345, 1459041420000000);
@@ -199,6 +206,8 @@ int main(int argc, char* argv[]) {
         test_next("Mon 2017-05~07/1 UTC", "", 12345, 1496016000000000);
 
         assert_se(calendar_spec_from_string("test", &c) < 0);
+        assert_se(calendar_spec_from_string(" utc", &c) < 0);
+        assert_se(calendar_spec_from_string("    ", &c) < 0);
         assert_se(calendar_spec_from_string("", &c) < 0);
         assert_se(calendar_spec_from_string("7", &c) < 0);
         assert_se(calendar_spec_from_string("121212:1:2", &c) < 0);
@@ -208,6 +217,11 @@ int main(int argc, char* argv[]) {
         assert_se(calendar_spec_from_string("00:00:00.0..00.9", &c) < 0);
         assert_se(calendar_spec_from_string("2016~11-22", &c) < 0);
         assert_se(calendar_spec_from_string("*-*~5/5", &c) < 0);
+        assert_se(calendar_spec_from_string("Monday.. 12:00", &c) < 0);
+        assert_se(calendar_spec_from_string("Monday..", &c) < 0);
+        assert_se(calendar_spec_from_string("-00:+00/-5", &c) < 0);
+        assert_se(calendar_spec_from_string("00:+00/-5", &c) < 0);
+        assert_se(calendar_spec_from_string("2016- 11- 24 12: 30: 00", &c) < 0);
 
         test_timestamp();
         test_hourly_bug_4031();