|
 |
930e1b8 |
From d5910017f2cfaea144f766a3fb772b53f8d9dcbf Mon Sep 17 00:00:00 2001
|
|
|
930e1b8 |
From: Lennart Poettering <lennart@poettering.net>
|
|
|
930e1b8 |
Date: Mon, 11 Nov 2013 03:02:52 +0100
|
|
|
930e1b8 |
Subject: [PATCH] timer: properly format relative timestamps in the future
|
|
|
930e1b8 |
|
|
|
930e1b8 |
---
|
|
|
930e1b8 |
src/shared/time-util.c | 69 ++++++++++++++++++++++++++++++++------------------
|
|
|
930e1b8 |
1 file changed, 44 insertions(+), 25 deletions(-)
|
|
|
930e1b8 |
|
|
|
930e1b8 |
diff --git a/src/shared/time-util.c b/src/shared/time-util.c
|
|
|
930e1b8 |
index 860be61..b8a6bd7 100644
|
|
|
930e1b8 |
--- a/src/shared/time-util.c
|
|
|
930e1b8 |
+++ b/src/shared/time-util.c
|
|
|
930e1b8 |
@@ -191,55 +191,62 @@ char *format_timestamp_us(char *buf, size_t l, usec_t t) {
|
|
|
930e1b8 |
}
|
|
|
930e1b8 |
|
|
|
930e1b8 |
char *format_timestamp_relative(char *buf, size_t l, usec_t t) {
|
|
|
930e1b8 |
+ const char *s;
|
|
|
930e1b8 |
usec_t n, d;
|
|
|
930e1b8 |
|
|
|
930e1b8 |
n = now(CLOCK_REALTIME);
|
|
|
930e1b8 |
|
|
|
930e1b8 |
- if (t <= 0 || t > n || t + USEC_PER_DAY*7 <= t)
|
|
|
930e1b8 |
+ if (t <= 0 || (t == (usec_t) -1))
|
|
|
930e1b8 |
return NULL;
|
|
|
930e1b8 |
|
|
|
930e1b8 |
- d = n - t;
|
|
|
930e1b8 |
+ if (n > t) {
|
|
|
930e1b8 |
+ d = n - t;
|
|
|
930e1b8 |
+ s = "ago";
|
|
|
930e1b8 |
+ } else {
|
|
|
930e1b8 |
+ d = t - n;
|
|
|
930e1b8 |
+ s = "left";
|
|
|
930e1b8 |
+ }
|
|
|
930e1b8 |
|
|
|
930e1b8 |
if (d >= USEC_PER_YEAR)
|
|
|
930e1b8 |
- snprintf(buf, l, "%llu years %llu months ago",
|
|
|
930e1b8 |
+ snprintf(buf, l, "%llu years %llu months %s",
|
|
|
930e1b8 |
(unsigned long long) (d / USEC_PER_YEAR),
|
|
|
930e1b8 |
- (unsigned long long) ((d % USEC_PER_YEAR) / USEC_PER_MONTH));
|
|
|
930e1b8 |
+ (unsigned long long) ((d % USEC_PER_YEAR) / USEC_PER_MONTH), s);
|
|
|
930e1b8 |
else if (d >= USEC_PER_MONTH)
|
|
|
930e1b8 |
- snprintf(buf, l, "%llu months %llu days ago",
|
|
|
930e1b8 |
+ snprintf(buf, l, "%llu months %llu days %s",
|
|
|
930e1b8 |
(unsigned long long) (d / USEC_PER_MONTH),
|
|
|
930e1b8 |
- (unsigned long long) ((d % USEC_PER_MONTH) / USEC_PER_DAY));
|
|
|
930e1b8 |
+ (unsigned long long) ((d % USEC_PER_MONTH) / USEC_PER_DAY), s);
|
|
|
930e1b8 |
else if (d >= USEC_PER_WEEK)
|
|
|
930e1b8 |
- snprintf(buf, l, "%llu weeks %llu days ago",
|
|
|
930e1b8 |
+ snprintf(buf, l, "%llu weeks %llu days %s",
|
|
|
930e1b8 |
(unsigned long long) (d / USEC_PER_WEEK),
|
|
|
930e1b8 |
- (unsigned long long) ((d % USEC_PER_WEEK) / USEC_PER_DAY));
|
|
|
930e1b8 |
+ (unsigned long long) ((d % USEC_PER_WEEK) / USEC_PER_DAY), s);
|
|
|
930e1b8 |
else if (d >= 2*USEC_PER_DAY)
|
|
|
930e1b8 |
- snprintf(buf, l, "%llu days ago", (unsigned long long) (d / USEC_PER_DAY));
|
|
|
930e1b8 |
+ snprintf(buf, l, "%llu days %s", (unsigned long long) (d / USEC_PER_DAY), s);
|
|
|
930e1b8 |
else if (d >= 25*USEC_PER_HOUR)
|
|
|
930e1b8 |
- snprintf(buf, l, "1 day %lluh ago",
|
|
|
930e1b8 |
- (unsigned long long) ((d - USEC_PER_DAY) / USEC_PER_HOUR));
|
|
|
930e1b8 |
+ snprintf(buf, l, "1 day %lluh %s",
|
|
|
930e1b8 |
+ (unsigned long long) ((d - USEC_PER_DAY) / USEC_PER_HOUR), s);
|
|
|
930e1b8 |
else if (d >= 6*USEC_PER_HOUR)
|
|
|
930e1b8 |
- snprintf(buf, l, "%lluh ago",
|
|
|
930e1b8 |
- (unsigned long long) (d / USEC_PER_HOUR));
|
|
|
930e1b8 |
+ snprintf(buf, l, "%lluh %s",
|
|
|
930e1b8 |
+ (unsigned long long) (d / USEC_PER_HOUR), s);
|
|
|
930e1b8 |
else if (d >= USEC_PER_HOUR)
|
|
|
930e1b8 |
- snprintf(buf, l, "%lluh %llumin ago",
|
|
|
930e1b8 |
+ snprintf(buf, l, "%lluh %llumin %s",
|
|
|
930e1b8 |
(unsigned long long) (d / USEC_PER_HOUR),
|
|
|
930e1b8 |
- (unsigned long long) ((d % USEC_PER_HOUR) / USEC_PER_MINUTE));
|
|
|
930e1b8 |
+ (unsigned long long) ((d % USEC_PER_HOUR) / USEC_PER_MINUTE), s);
|
|
|
930e1b8 |
else if (d >= 5*USEC_PER_MINUTE)
|
|
|
930e1b8 |
- snprintf(buf, l, "%llumin ago",
|
|
|
930e1b8 |
- (unsigned long long) (d / USEC_PER_MINUTE));
|
|
|
930e1b8 |
+ snprintf(buf, l, "%llumin %s",
|
|
|
930e1b8 |
+ (unsigned long long) (d / USEC_PER_MINUTE), s);
|
|
|
930e1b8 |
else if (d >= USEC_PER_MINUTE)
|
|
|
930e1b8 |
- snprintf(buf, l, "%llumin %llus ago",
|
|
|
930e1b8 |
+ snprintf(buf, l, "%llumin %llus %s",
|
|
|
930e1b8 |
(unsigned long long) (d / USEC_PER_MINUTE),
|
|
|
930e1b8 |
- (unsigned long long) ((d % USEC_PER_MINUTE) / USEC_PER_SEC));
|
|
|
930e1b8 |
+ (unsigned long long) ((d % USEC_PER_MINUTE) / USEC_PER_SEC), s);
|
|
|
930e1b8 |
else if (d >= USEC_PER_SEC)
|
|
|
930e1b8 |
- snprintf(buf, l, "%llus ago",
|
|
|
930e1b8 |
- (unsigned long long) (d / USEC_PER_SEC));
|
|
|
930e1b8 |
+ snprintf(buf, l, "%llus %s",
|
|
|
930e1b8 |
+ (unsigned long long) (d / USEC_PER_SEC), s);
|
|
|
930e1b8 |
else if (d >= USEC_PER_MSEC)
|
|
|
930e1b8 |
- snprintf(buf, l, "%llums ago",
|
|
|
930e1b8 |
- (unsigned long long) (d / USEC_PER_MSEC));
|
|
|
930e1b8 |
+ snprintf(buf, l, "%llums %s",
|
|
|
930e1b8 |
+ (unsigned long long) (d / USEC_PER_MSEC), s);
|
|
|
930e1b8 |
else if (d > 0)
|
|
|
930e1b8 |
- snprintf(buf, l, "%lluus ago",
|
|
|
930e1b8 |
- (unsigned long long) d);
|
|
|
930e1b8 |
+ snprintf(buf, l, "%lluus %s",
|
|
|
930e1b8 |
+ (unsigned long long) d, s);
|
|
|
930e1b8 |
else
|
|
|
930e1b8 |
snprintf(buf, l, "now");
|
|
|
930e1b8 |
|
|
|
930e1b8 |
@@ -479,6 +486,18 @@ int parse_timestamp(const char *t, usec_t *usec) {
|
|
|
930e1b8 |
return r;
|
|
|
930e1b8 |
|
|
|
930e1b8 |
goto finish;
|
|
|
930e1b8 |
+ } else if (endswith(t, " left")) {
|
|
|
930e1b8 |
+ _cleanup_free_ char *z;
|
|
|
930e1b8 |
+
|
|
|
930e1b8 |
+ z = strndup(t, strlen(t) - 4);
|
|
|
930e1b8 |
+ if (!z)
|
|
|
930e1b8 |
+ return -ENOMEM;
|
|
|
930e1b8 |
+
|
|
|
930e1b8 |
+ r = parse_sec(z, &plus);
|
|
|
930e1b8 |
+ if (r < 0)
|
|
|
930e1b8 |
+ return r;
|
|
|
930e1b8 |
+
|
|
|
930e1b8 |
+ goto finish;
|
|
|
930e1b8 |
}
|
|
|
930e1b8 |
|
|
|
930e1b8 |
for (i = 0; i < ELEMENTSOF(day_nr); i++) {
|