TODO: update

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

diff --git a/src/shared/time-util.c b/src/shared/time-util.c
index 4fd8f08984d3c0df608348868a20a17dfbc62cb0..0c6deb66f4242367192a8da54a9894be7c4e4b0c 100644 (file)
--- a/src/shared/time-util.c
+++ b/src/shared/time-util.c
@@ -230,6 +230,8 @@ char *format_timespan(char *buf, size_t l, usec_t t) {
                 const char *suffix;
                 usec_t usec;
         } table[] = {
+                { "y", USEC_PER_YEAR },
+                { "month", USEC_PER_MONTH },
                 { "w", USEC_PER_WEEK },
                 { "d", USEC_PER_DAY },
                 { "h", USEC_PER_HOUR },
@@ -545,7 +547,7 @@ int parse_usec(const char *t, usec_t *usec) {
                 errno = 0;
                 l = strtoll(p, &e, 10);
 
-                if (errno != 0)
+                if (errno > 0)
                         return -errno;
 
                 if (l < 0)
@@ -625,7 +627,7 @@ int parse_nsec(const char *t, nsec_t *nsec) {
                 errno = 0;
                 l = strtoll(p, &e, 10);
 
-                if (errno != 0)
+                if (errno > 0)
                         return -errno;
 
                 if (l < 0)