From: Lennart Poettering Date: Fri, 24 Oct 2014 17:07:26 +0000 (+0200) Subject: time: also support 'infinity' syntax in parse_nsec() X-Git-Tag: v217~73 X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=e73c78c27511b03c7abc55aed87896092c0de699 time: also support 'infinity' syntax in parse_nsec() Let's make parse_usec() and parse_nsec() work similar --- diff --git a/src/shared/time-util.c b/src/shared/time-util.c index 433c262df..4d34362bc 100644 --- a/src/shared/time-util.c +++ b/src/shared/time-util.c @@ -773,7 +773,7 @@ int parse_nsec(const char *t, nsec_t *nsec) { { "", 1ULL }, /* default is nsec */ }; - const char *p; + const char *p, *s; nsec_t r = 0; bool something = false; @@ -781,6 +781,18 @@ int parse_nsec(const char *t, nsec_t *nsec) { assert(nsec); p = t; + + p += strspn(p, WHITESPACE); + s = startswith(p, "infinity"); + if (s) { + s += strspn(s, WHITESPACE); + if (!*s != 0) + return -EINVAL; + + *nsec = NSEC_INFINITY; + return 0; + } + for (;;) { long long l, z = 0; char *e;