don't remap internal-use syscall macros to nonexistent time32 syscalls

[musl] / src / time / localtime_r.c

diff --git a/src/time/localtime_r.c b/src/time/localtime_r.c
index 2bf1037..1a15b31 100644 (file)
--- a/src/time/localtime_r.c
+++ b/src/time/localtime_r.c
@@ -1,11 +1,21 @@
-#include <time.h>
+#include "time_impl.h"
+#include <errno.h>
+#include <limits.h>
 
-#include "__time.h"
-
-struct tm *localtime_r(const time_t *t, struct tm *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);
+       /* Reject time_t values whose year would overflow int because
+        * __secs_to_zone cannot safely handle them. */
+       if (*t < INT_MIN * 31622400LL || *t > INT_MAX * 31622400LL) {
+               errno = EOVERFLOW;
+               return 0;
+       }
+       __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 = EOVERFLOW;
+               return 0;
+       }
+       return tm;
 }
+
+weak_alias(__localtime_r, localtime_r);