chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
cgroup: rename cg_update_unified() → cg_unified_update()
[elogind.git]
/
src
/
basic
/
time-util.c
diff --git
a/src/basic/time-util.c
b/src/basic/time-util.c
index 2455636843f8e80b13c0fa8f73ff42aa17fe581d..a2b57f872716a37ecdb6de7adbbaf5f998c431cb 100644
(file)
--- a/
src/basic/time-util.c
+++ b/
src/basic/time-util.c
@@
-189,7
+189,7
@@
usec_t triple_timestamp_by_clock(triple_timestamp *ts, clockid_t clock) {
usec_t timespec_load(const struct timespec *ts) {
assert(ts);
usec_t timespec_load(const struct timespec *ts) {
assert(ts);
- if (ts->tv_sec
== (time_t) -1 && ts->tv_nsec == (long) -1
)
+ if (ts->tv_sec
< 0 || ts->tv_nsec < 0
)
return USEC_INFINITY;
if ((usec_t) ts->tv_sec > (UINT64_MAX - (ts->tv_nsec / NSEC_PER_USEC)) / USEC_PER_SEC)
return USEC_INFINITY;
if ((usec_t) ts->tv_sec > (UINT64_MAX - (ts->tv_nsec / NSEC_PER_USEC)) / USEC_PER_SEC)
@@
-204,7
+204,7
@@
usec_t timespec_load(const struct timespec *ts) {
nsec_t timespec_load_nsec(const struct timespec *ts) {
assert(ts);
nsec_t timespec_load_nsec(const struct timespec *ts) {
assert(ts);
- if (ts->tv_sec
== (time_t) -1 && ts->tv_nsec == (long) -1
)
+ if (ts->tv_sec
< 0 || ts->tv_nsec < 0
)
return NSEC_INFINITY;
if ((nsec_t) ts->tv_sec >= (UINT64_MAX - ts->tv_nsec) / NSEC_PER_SEC)
return NSEC_INFINITY;
if ((nsec_t) ts->tv_sec >= (UINT64_MAX - ts->tv_nsec) / NSEC_PER_SEC)
@@
-217,7
+217,8
@@
nsec_t timespec_load_nsec(const struct timespec *ts) {
struct timespec *timespec_store(struct timespec *ts, usec_t u) {
assert(ts);
struct timespec *timespec_store(struct timespec *ts, usec_t u) {
assert(ts);
- if (u == USEC_INFINITY) {
+ if (u == USEC_INFINITY ||
+ u / USEC_PER_SEC >= TIME_T_MAX) {
ts->tv_sec = (time_t) -1;
ts->tv_nsec = (long) -1;
return ts;
ts->tv_sec = (time_t) -1;
ts->tv_nsec = (long) -1;
return ts;
@@
-232,8
+233,7
@@
struct timespec *timespec_store(struct timespec *ts, usec_t u) {
usec_t timeval_load(const struct timeval *tv) {
assert(tv);
usec_t timeval_load(const struct timeval *tv) {
assert(tv);
- if (tv->tv_sec == (time_t) -1 &&
- tv->tv_usec == (suseconds_t) -1)
+ if (tv->tv_sec < 0 || tv->tv_usec < 0)
return USEC_INFINITY;
if ((usec_t) tv->tv_sec > (UINT64_MAX - tv->tv_usec) / USEC_PER_SEC)
return USEC_INFINITY;
if ((usec_t) tv->tv_sec > (UINT64_MAX - tv->tv_usec) / USEC_PER_SEC)
@@
-247,7
+247,8
@@
usec_t timeval_load(const struct timeval *tv) {
struct timeval *timeval_store(struct timeval *tv, usec_t u) {
assert(tv);
struct timeval *timeval_store(struct timeval *tv, usec_t u) {
assert(tv);
- if (u == USEC_INFINITY) {
+ if (u == USEC_INFINITY||
+ u / USEC_PER_SEC > TIME_T_MAX) {
tv->tv_sec = (time_t) -1;
tv->tv_usec = (suseconds_t) -1;
} else {
tv->tv_sec = (time_t) -1;
tv->tv_usec = (suseconds_t) -1;
} else {
@@
-294,9
+295,11
@@
static char *format_timestamp_internal(
if (t <= 0 || t == USEC_INFINITY)
return NULL; /* Timestamp is unset */
if (t <= 0 || t == USEC_INFINITY)
return NULL; /* Timestamp is unset */
+ /* Let's not format times with years > 9999 */
+ if (t > USEC_TIMESTAMP_FORMATTABLE_MAX)
+ return NULL;
+
sec = (time_t) (t / USEC_PER_SEC); /* Round down */
sec = (time_t) (t / USEC_PER_SEC); /* Round down */
- if ((usec_t) sec != (t / USEC_PER_SEC))
- return NULL; /* overflow? */
if (!localtime_or_gmtime_r(&sec, &tm, utc))
return NULL;
if (!localtime_or_gmtime_r(&sec, &tm, utc))
return NULL;
@@
-315,7
+318,7
@@
static char *format_timestamp_internal(
if (n + 8 > l)
return NULL; /* Microseconds part doesn't fit. */
if (n + 8 > l)
return NULL; /* Microseconds part doesn't fit. */
- sprintf(buf + n, ".%06
llu", (unsigned long long) (t % USEC_PER_SEC)
);
+ sprintf(buf + n, ".%06
"PRI_USEC, t % USEC_PER_SEC
);
}
/* Append the timezone */
}
/* Append the timezone */
@@
-509,11
+512,11
@@
char *format_timespan(char *buf, size_t l, usec_t t, usec_t accuracy) {
if (j > 0) {
k = snprintf(p, l,
if (j > 0) {
k = snprintf(p, l,
- "%s"USEC_FMT".%0*
llu
%s",
+ "%s"USEC_FMT".%0*
"PRI_USEC"
%s",
p > buf ? " " : "",
a,
j,
p > buf ? " " : "",
a,
j,
-
(unsigned long long)
b,
+ b,
table[i].suffix);
t = 0;
table[i].suffix);
t = 0;
@@
-562,12
+565,12
@@
void dual_timestamp_serialize(FILE *f, const char *name, dual_timestamp *t) {
}
int dual_timestamp_deserialize(const char *value, dual_timestamp *t) {
}
int dual_timestamp_deserialize(const char *value, dual_timestamp *t) {
- u
nsigned long long
a, b;
+ u
int64_t
a, b;
assert(value);
assert(t);
assert(value);
assert(t);
- if (sscanf(value, "%
llu %llu"
, &a, &b) != 2) {
+ if (sscanf(value, "%
" PRIu64 "%" PRIu64
, &a, &b) != 2) {
log_debug("Failed to parse dual timestamp value \"%s\": %m", value);
return -EINVAL;
}
log_debug("Failed to parse dual timestamp value \"%s\": %m", value);
return -EINVAL;
}
@@
-843,16
+846,23
@@
parse_usec:
from_tm:
x = mktime_or_timegm(&tm, utc);
from_tm:
x = mktime_or_timegm(&tm, utc);
- if (x
== (time_t) -1
)
+ if (x
< 0
)
return -EINVAL;
if (weekday >= 0 && tm.tm_wday != weekday)
return -EINVAL;
ret = (usec_t) x * USEC_PER_SEC + x_usec;
return -EINVAL;
if (weekday >= 0 && tm.tm_wday != weekday)
return -EINVAL;
ret = (usec_t) x * USEC_PER_SEC + x_usec;
+ if (ret > USEC_TIMESTAMP_FORMATTABLE_MAX)
+ return -EINVAL;
finish:
finish:
+ if (ret + plus < ret) /* overflow? */
+ return -EINVAL;
ret += plus;
ret += plus;
+ if (ret > USEC_TIMESTAMP_FORMATTABLE_MAX)
+ return -EINVAL;
+
if (ret > minus)
ret -= minus;
else
if (ret > minus)
ret -= minus;
else
@@
-897,6
+907,7
@@
static char* extract_multiplier(char *p, usec_t *multiplier) {
{ "y", USEC_PER_YEAR },
{ "usec", 1ULL },
{ "us", 1ULL },
{ "y", USEC_PER_YEAR },
{ "usec", 1ULL },
{ "us", 1ULL },
+ { "µs", 1ULL },
};
unsigned i;
};
unsigned i;
@@
-1031,6
+1042,7
@@
int parse_nsec(const char *t, nsec_t *nsec) {
{ "y", NSEC_PER_YEAR },
{ "usec", NSEC_PER_USEC },
{ "us", NSEC_PER_USEC },
{ "y", NSEC_PER_YEAR },
{ "usec", NSEC_PER_USEC },
{ "us", NSEC_PER_USEC },
+ { "µs", NSEC_PER_USEC },
{ "nsec", 1ULL },
{ "ns", 1ULL },
{ "", 1ULL }, /* default is nsec */
{ "nsec", 1ULL },
{ "ns", 1ULL },
{ "", 1ULL }, /* default is nsec */
@@
-1287,7
+1299,7
@@
bool clock_supported(clockid_t clock) {
if (!clock_boottime_supported())
return false;
if (!clock_boottime_supported())
return false;
- /* fall through
, after checking the cached value for CLOCK_BOOTTIME.
*/
+ /* fall through */
default:
/* For everything else, check properly */
default:
/* For everything else, check properly */
@@
-1341,7
+1353,7
@@
unsigned long usec_to_jiffies(usec_t u) {
r = sysconf(_SC_CLK_TCK);
assert(r > 0);
r = sysconf(_SC_CLK_TCK);
assert(r > 0);
- hz =
(unsigned long)
r;
+ hz = r;
}
return DIV_ROUND_UP(u , USEC_PER_SEC / hz);
}
return DIV_ROUND_UP(u , USEC_PER_SEC / hz);