util: teach parse_timestamp() to parse results of format_timestamp_relative()

diff --git a/src/shared/time-util.c b/src/shared/time-util.c
index 3d00b20eec84069d75a2168542ff8d4fb1448a55..7f477100b3ddebe6640fb65373f088529e1805be 100644 (file)
--- a/src/shared/time-util.c
+++ b/src/shared/time-util.c
@@ -344,6 +344,19 @@ int parse_timestamp(const char *t, usec_t *usec) {
                         return r;
 
                 goto finish;
+
+        } else if (endswith(t, " ago")) {
+                _cleanup_free_ char *z;
+
+                z = strndup(t, strlen(t) - 4);
+                if (!z)
+                        return -ENOMEM;
+
+                r = parse_usec(z, &minus);
+                if (r < 0)
+                        return r;
+
+                goto finish;
         }
 
         copy = tm;

diff --git a/src/test/test-date.c b/src/test/test-date.c
index 57f8b371d3a33aaa62cd9205000f0410e105feb3..7e14d196c69d4cec3ba9fa7dd186e4461a9c2605 100644 (file)
--- a/src/test/test-date.c
+++ b/src/test/test-date.c
@@ -65,5 +65,8 @@ int main(int argc, char *argv[]) {
         assert_se(parse_timestamp("+2y 4d", &t) >= 0);
         log_info("%s", format_timestamp(buf, sizeof(buf), t));
 
+        assert_se(parse_timestamp("5months ago", &t) >= 0);
+        log_info("%s", format_timestamp(buf, sizeof(buf), t));
+
         return 0;
 }