summaryrefslogtreecommitdiff
path: root/src/time/localtime_r.c
diff options
context:
space:
mode:
authorRich Felker <dalias@aerifal.cx>2013-07-17 05:24:50 -0400
committerRich Felker <dalias@aerifal.cx>2013-07-17 05:24:50 -0400
commit1cc81f5cb0df2b66a795ff0c26d7bbc4d16e13c6 (patch)
treed8839fbfd8cb1fb5658394cad6a6a06688ab6a1b /src/time/localtime_r.c
parentf1292e3d28309bbc81f61671164843cec4319bfa (diff)
downloadmusl-1cc81f5cb0df2b66a795ff0c26d7bbc4d16e13c6.tar.gz
the big time handling overhaul
this commit has two major user-visible parts: zoneinfo-format time zones are now supported, and overflow handling is intended to be complete in the sense that all functions return a correct result if and only if the result fits in the destination type, and otherwise return an error. also, some noticable bugs in the way DST detection and normalization worked have been fixed, and performance may be better than before, but it has not been tested.
Diffstat (limited to 'src/time/localtime_r.c')
-rw-r--r--src/time/localtime_r.c20
1 files changed, 12 insertions, 8 deletions
diff --git a/src/time/localtime_r.c b/src/time/localtime_r.c
index 389a5917..b36c1d82 100644
--- a/src/time/localtime_r.c
+++ b/src/time/localtime_r.c
@@ -1,11 +1,15 @@
-#include <time.h>
+#include "time_impl.h"
+#include <errno.h>
+#include "libc.h"
-#include "__time.h"
-
-struct tm *localtime_r(const time_t *restrict t, struct tm *restrict result)
+struct tm *__localtime_r(const time_t *restrict t, struct tm *restrict tm)
{
- __tzset();
- __time_to_tm(*t - __timezone, result);
- result->tm_isdst = -1;
- return __dst_adjust(result);
+ __secs_to_zone(*t, 0, &tm->tm_isdst, &tm->__tm_gmtoff, 0, &tm->__tm_zone);
+ if (__secs_to_tm((long long)*t - tm->__tm_gmtoff, tm) < 0) {
+ errno = EINVAL;
+ return 0;
+ }
+ return tm;
}
+
+weak_alias(__localtime_r, localtime_r);