Do not print invalid UTF-8 in error messages

[elogind.git] / src / shared / time-util.c

diff --git a/src/shared/time-util.c b/src/shared/time-util.c
index b6a2bec15693161bc7e1b6ccd38cb6515611a3d4..faa3418819e81dfe4e526966bac34554425cad68 100644 (file)
--- a/src/shared/time-util.c
+++ b/src/shared/time-util.c
@@ -21,6 +21,7 @@
 
 #include <time.h>
 #include <string.h>
 
 #include <time.h>
 #include <string.h>

+#include <sys/timex.h>

 
 #include "util.h"
 #include "time-util.h"
 
 #include "util.h"
 #include "time-util.h"


@@ -141,12 +142,11 @@ struct timeval *timeval_store(struct timeval *tv, usec_t u) {
         if (u == (usec_t) -1) {
                 tv->tv_sec = (time_t) -1;
                 tv->tv_usec = (suseconds_t) -1;
         if (u == (usec_t) -1) {
                 tv->tv_sec = (time_t) -1;
                 tv->tv_usec = (suseconds_t) -1;

-                return tv;
+        } else {
+                tv->tv_sec = (time_t) (u / USEC_PER_SEC);
+                tv->tv_usec = (suseconds_t) (u % USEC_PER_SEC);

         }
 
         }
 

-        tv->tv_sec = (time_t) (u / USEC_PER_SEC);
-        tv->tv_usec = (suseconds_t) (u % USEC_PER_SEC);
-

         return tv;
 }
 
         return tv;
 }
 


@@ -157,7 +157,7 @@ char *format_timestamp(char *buf, size_t l, usec_t t) {
         assert(buf);
         assert(l > 0);
 
         assert(buf);
         assert(l > 0);
 

-        if (t <= 0)
+        if (t <= 0 || t == (usec_t) -1)

                 return NULL;
 
         sec = (time_t) (t / USEC_PER_SEC);
                 return NULL;
 
         sec = (time_t) (t / USEC_PER_SEC);


@@ -168,56 +168,85 @@ char *format_timestamp(char *buf, size_t l, usec_t t) {
         return buf;
 }
 
         return buf;
 }
 

+char *format_timestamp_us(char *buf, size_t l, usec_t t) {
+        struct tm tm;
+        time_t sec;
+
+        assert(buf);
+        assert(l > 0);
+
+        if (t <= 0 || t == (usec_t) -1)
+                return NULL;
+
+        sec = (time_t) (t / USEC_PER_SEC);
+        localtime_r(&sec, &tm);
+
+        if (strftime(buf, l, "%a %Y-%m-%d %H:%M:%S", &tm) <= 0)
+                return NULL;
+        snprintf(buf + strlen(buf), l - strlen(buf), ".%06llu", t % USEC_PER_SEC);
+        if (strftime(buf + strlen(buf), l - strlen(buf), " %Z", &tm) <= 0)
+                return NULL;
+
+        return buf;
+}
+

 char *format_timestamp_relative(char *buf, size_t l, usec_t t) {
 char *format_timestamp_relative(char *buf, size_t l, usec_t t) {

+        const char *s;

         usec_t n, d;
 
         n = now(CLOCK_REALTIME);
 
         usec_t n, d;
 
         n = now(CLOCK_REALTIME);
 

-        if (t <= 0 || t > n || t + USEC_PER_DAY*7 <= t)
+        if (t <= 0 || (t == (usec_t) -1))

                 return NULL;
 
                 return NULL;
 

-        d = n - t;
+        if (n > t) {
+                d = n - t;
+                s = "ago";
+        } else {
+                d = t - n;
+                s = "left";
+        }

 
         if (d >= USEC_PER_YEAR)
 
         if (d >= USEC_PER_YEAR)

-                snprintf(buf, l, "%llu years %llu months ago",
+                snprintf(buf, l, "%llu years %llu months %s",

                          (unsigned long long) (d / USEC_PER_YEAR),
                          (unsigned long long) (d / USEC_PER_YEAR),

-                         (unsigned long long) ((d % USEC_PER_YEAR) / USEC_PER_MONTH));
+                         (unsigned long long) ((d % USEC_PER_YEAR) / USEC_PER_MONTH), s);

         else if (d >= USEC_PER_MONTH)
         else if (d >= USEC_PER_MONTH)

-                snprintf(buf, l, "%llu months %llu days ago",
+                snprintf(buf, l, "%llu months %llu days %s",

                          (unsigned long long) (d / USEC_PER_MONTH),
                          (unsigned long long) (d / USEC_PER_MONTH),

-                         (unsigned long long) ((d % USEC_PER_MONTH) / USEC_PER_DAY));
+                         (unsigned long long) ((d % USEC_PER_MONTH) / USEC_PER_DAY), s);

         else if (d >= USEC_PER_WEEK)
         else if (d >= USEC_PER_WEEK)

-                snprintf(buf, l, "%llu weeks %llu days ago",
+                snprintf(buf, l, "%llu weeks %llu days %s",

                          (unsigned long long) (d / USEC_PER_WEEK),
                          (unsigned long long) (d / USEC_PER_WEEK),

-                         (unsigned long long) ((d % USEC_PER_WEEK) / USEC_PER_DAY));
+                         (unsigned long long) ((d % USEC_PER_WEEK) / USEC_PER_DAY), s);

         else if (d >= 2*USEC_PER_DAY)
         else if (d >= 2*USEC_PER_DAY)

-                snprintf(buf, l, "%llu days ago", (unsigned long long) (d / USEC_PER_DAY));
+                snprintf(buf, l, "%llu days %s", (unsigned long long) (d / USEC_PER_DAY), s);

         else if (d >= 25*USEC_PER_HOUR)
         else if (d >= 25*USEC_PER_HOUR)

-                snprintf(buf, l, "1 day %lluh ago",
-                         (unsigned long long) ((d - USEC_PER_DAY) / USEC_PER_HOUR));
+                snprintf(buf, l, "1 day %lluh %s",
+                         (unsigned long long) ((d - USEC_PER_DAY) / USEC_PER_HOUR), s);

         else if (d >= 6*USEC_PER_HOUR)
         else if (d >= 6*USEC_PER_HOUR)

-                snprintf(buf, l, "%lluh ago",
-                         (unsigned long long) (d / USEC_PER_HOUR));
+                snprintf(buf, l, "%lluh %s",
+                         (unsigned long long) (d / USEC_PER_HOUR), s);

         else if (d >= USEC_PER_HOUR)
         else if (d >= USEC_PER_HOUR)

-                snprintf(buf, l, "%lluh %llumin ago",
+                snprintf(buf, l, "%lluh %llumin %s",

                          (unsigned long long) (d / USEC_PER_HOUR),
                          (unsigned long long) (d / USEC_PER_HOUR),

-                         (unsigned long long) ((d % USEC_PER_HOUR) / USEC_PER_MINUTE));
+                         (unsigned long long) ((d % USEC_PER_HOUR) / USEC_PER_MINUTE), s);

         else if (d >= 5*USEC_PER_MINUTE)
         else if (d >= 5*USEC_PER_MINUTE)

-                snprintf(buf, l, "%llumin ago",
-                         (unsigned long long) (d / USEC_PER_MINUTE));
+                snprintf(buf, l, "%llumin %s",
+                         (unsigned long long) (d / USEC_PER_MINUTE), s);

         else if (d >= USEC_PER_MINUTE)
         else if (d >= USEC_PER_MINUTE)

-                snprintf(buf, l, "%llumin %llus ago",
+                snprintf(buf, l, "%llumin %llus %s",

                          (unsigned long long) (d / USEC_PER_MINUTE),
                          (unsigned long long) (d / USEC_PER_MINUTE),

-                         (unsigned long long) ((d % USEC_PER_MINUTE) / USEC_PER_SEC));
+                         (unsigned long long) ((d % USEC_PER_MINUTE) / USEC_PER_SEC), s);

         else if (d >= USEC_PER_SEC)
         else if (d >= USEC_PER_SEC)

-                snprintf(buf, l, "%llus ago",
-                         (unsigned long long) (d / USEC_PER_SEC));
+                snprintf(buf, l, "%llus %s",
+                         (unsigned long long) (d / USEC_PER_SEC), s);

         else if (d >= USEC_PER_MSEC)
         else if (d >= USEC_PER_MSEC)

-                snprintf(buf, l, "%llums ago",
-                         (unsigned long long) (d / USEC_PER_MSEC));
+                snprintf(buf, l, "%llums %s",
+                         (unsigned long long) (d / USEC_PER_MSEC), s);

         else if (d > 0)
         else if (d > 0)

-                snprintf(buf, l, "%lluus ago",
-                         (unsigned long long) d);
+                snprintf(buf, l, "%lluus %s",
+                         (unsigned long long) d, s);

         else
                 snprintf(buf, l, "now");
 
         else
                 snprintf(buf, l, "now");
 


@@ -251,23 +280,25 @@ char *format_timespan(char *buf, size_t l, usec_t t, usec_t accuracy) {
         if (t == (usec_t) -1)
                 return NULL;
 
         if (t == (usec_t) -1)
                 return NULL;
 

+        if (t <= 0) {
+                snprintf(p, l, "0");
+                p[l-1] = 0;
+                return p;
+        }
+

         /* The result of this function can be parsed with parse_sec */
 
         for (i = 0; i < ELEMENTSOF(table); i++) {
         /* The result of this function can be parsed with parse_sec */
 
         for (i = 0; i < ELEMENTSOF(table); i++) {

-                int k;
+                int k = 0;

                 size_t n;
                 bool done = false;
                 usec_t a, b;
 
                 size_t n;
                 bool done = false;
                 usec_t a, b;
 

-                if (t == 0 || t < accuracy) {
-                        if (!something) {
-                                snprintf(p, l, "0");
-                                p[l-1] = 0;
-                                return p;
-                        }
+                if (t <= 0)
+                        break;

 
 

+                if (t < accuracy && something)

                         break;
                         break;

-                }

 
                 if (t < table[i].usec)
                         continue;
 
                 if (t < table[i].usec)
                         continue;


@@ -322,7 +353,6 @@ char *format_timespan(char *buf, size_t l, usec_t t, usec_t accuracy) {
                 l -= n;
                 p += n;
 
                 l -= n;
                 p += n;
 

-

                 something = true;
         }
 
                 something = true;
         }
 


@@ -352,7 +382,7 @@ void dual_timestamp_deserialize(const char *value, dual_timestamp *t) {
         assert(value);
         assert(t);
 
         assert(value);
         assert(t);
 

-        if (sscanf(value, "%lli %llu", &a, &b) != 2)
+        if (sscanf(value, "%llu %llu", &a, &b) != 2)

                 log_debug("Failed to parse finish timestamp value %s", value);
         else {
                 t->realtime = a;
                 log_debug("Failed to parse finish timestamp value %s", value);
         else {
                 t->realtime = a;


@@ -455,6 +485,18 @@ int parse_timestamp(const char *t, usec_t *usec) {
                 if (r < 0)
                         return r;
 
                 if (r < 0)
                         return r;
 

+                goto finish;
+        } else if (endswith(t, " left")) {
+                _cleanup_free_ char *z;
+
+                z = strndup(t, strlen(t) - 4);
+                if (!z)
+                        return -ENOMEM;
+
+                r = parse_sec(z, &plus);
+                if (r < 0)
+                        return r;
+

                 goto finish;
         }
 
                 goto finish;
         }
 


@@ -769,3 +811,15 @@ int parse_nsec(const char *t, nsec_t *nsec) {
 
         return 0;
 }
 
         return 0;
 }

+
+bool ntp_synced(void) {
+        struct timex txc = {};
+
+        if (adjtimex(&txc) < 0)
+                return false;
+
+        if (txc.status & STA_UNSYNC)
+                return false;
+
+        return true;
+}