fix use of memset without declaration in sched.h cpu set macros

[musl] / src / time / __tz.c

diff --git a/src/time/__tz.c b/src/time/__tz.c
index 26f4ea4..ffe8d40 100644 (file)
--- a/src/time/__tz.c
+++ b/src/time/__tz.c
@@ -27,7 +27,7 @@ static char old_tz_buf[32];
 static char *old_tz = old_tz_buf;
 static size_t old_tz_size = sizeof old_tz_buf;
 
-static int lock[2];
+static volatile int lock[2];
 
 static int getint(const char **p)
 {
@@ -36,19 +36,16 @@ static int getint(const char **p)
        return x;
 }
 
-static int getsigned(const char **p)
+static int getoff(const char **p)
 {
+       int neg = 0;
        if (**p == '-') {
                ++*p;
-               return -getint(p);
+               neg = 1;
+       } else if (**p == '+') {
+               ++*p;
        }
-       if (**p == '+') ++*p;
-       return getint(p);
-}
-
-static int getoff(const char **p)
-{
-       int off = 3600*getsigned(p);
+       int off = 3600*getint(p);
        if (**p == ':') {
                ++*p;
                off += 60*getint(p);
@@ -57,7 +54,7 @@ static int getoff(const char **p)
                        off += getint(p);
                }
        }
-       return off;
+       return neg ? -off : off;
 }
 
 static void getrule(const char **p, int rule[5])
@@ -87,7 +84,7 @@ static void getname(char *d, const char **p)
        int i;
        if (**p == '<') {
                ++*p;
-               for (i=0; **p!='>' && i<TZNAME_MAX; i++)
+               for (i=0; (*p)[i]!='>' && i<TZNAME_MAX; i++)
                        d[i] = (*p)[i];
                ++*p;
        } else {
@@ -121,14 +118,15 @@ int __munmap(void *, size_t);
 static void do_tzset()
 {
        char buf[NAME_MAX+25], *pathname=buf+24;
-       const char *try, *s;
+       const char *try, *s, *p;
        const unsigned char *map = 0;
        size_t i;
        static const char search[] =
                "/usr/share/zoneinfo/\0/share/zoneinfo/\0/etc/zoneinfo/\0";
 
        s = getenv("TZ");
-       if (!s || !*s) s = __gmt;
+       if (!s) s = "/etc/localtime";
+       if (!*s) s = __gmt;
 
        if (old_tz && !strcmp(s, old_tz)) return;
 
@@ -138,7 +136,7 @@ static void do_tzset()
         * free so as not to pull it into static programs. Growth
         * strategy makes it so free would have minimal benefit anyway. */
        i = strlen(s);
-       if (i > PATH_MAX+1) s = "", i = 0;
+       if (i > PATH_MAX+1) s = __gmt, i = 3;
        if (i >= old_tz_size) {
                old_tz_size *= 2;
                if (i >= old_tz_size) old_tz_size = i+1;
@@ -147,29 +145,32 @@ static void do_tzset()
        }
        if (old_tz) memcpy(old_tz, s, i+1);
 
-       if (*s == ':') s++;
-
        /* Non-suid can use an absolute tzfile pathname or a relative
         * pathame beginning with "."; in secure mode, only the
         * standard path will be searched. */
-       if (*s == '/' || *s == '.') {
-               if (!libc.secure) map = __map_file(s, &map_size);
-       } else {
-               for (i=0; s[i] && s[i]!=','; i++) {
-                       if (s[i]=='/') {
-                               size_t l = strlen(s);
-                               if (l > NAME_MAX || strchr(s, '.'))
-                                       break;
+       if (*s == ':' || ((p=strchr(s, '/')) && !memchr(s, ',', p-s))) {
+               if (*s == ':') s++;
+               if (*s == '/' || *s == '.') {
+                       if (!libc.secure || !strcmp(s, "/etc/localtime"))
+                               map = __map_file(s, &map_size);
+               } else {
+                       size_t l = strlen(s);
+                       if (l <= NAME_MAX && !strchr(s, '.')) {
                                memcpy(pathname, s, l+1);
                                pathname[l] = 0;
-                               for (try=search; !map && *try; try+=l) {
+                               for (try=search; !map && *try; try+=l+1) {
                                        l = strlen(try);
                                        memcpy(pathname-l, try, l);
                                        map = __map_file(pathname-l, &map_size);
                                }
-                               break;
                        }
                }
+               if (!map) s = __gmt;
+       }
+       if (map && (map_size < 44 || memcmp(map, "TZif", 4))) {
+               __munmap((void *)map, map_size);
+               map = 0;
+               s = __gmt;
        }
 
        zi = map;
@@ -353,9 +354,9 @@ void __secs_to_zone(long long t, int local, int *isdst, long *offset, long *oppo
                size_t alt, i = scan_trans(t, local, &alt);
                if (i != -1) {
                        *isdst = types[6*i+4];
-                       *offset = -(int32_t)zi_read32(types+6*i);
+                       *offset = (int32_t)zi_read32(types+6*i);
                        *zonename = (const char *)abbrevs + types[6*i+5];
-                       if (oppoff) *oppoff = -(int32_t)zi_read32(types+6*alt);
+                       if (oppoff) *oppoff = (int32_t)zi_read32(types+6*alt);
                        UNLOCK(lock);
                        return;
                }
@@ -372,32 +373,28 @@ void __secs_to_zone(long long t, int local, int *isdst, long *offset, long *oppo
        long long t0 = rule_to_secs(r0, y);
        long long t1 = rule_to_secs(r1, y);
 
+       if (!local) {
+               t0 += __timezone;
+               t1 += dst_off;
+       }
        if (t0 < t1) {
-               if (!local) {
-                       t0 += __timezone;
-                       t1 += dst_off;
-               }
                if (t >= t0 && t < t1) goto dst;
                goto std;
        } else {
-               if (!local) {
-                       t1 += __timezone;
-                       t0 += dst_off;
-               }
                if (t >= t1 && t < t0) goto std;
                goto dst;
        }
 std:
        *isdst = 0;
-       *offset = __timezone;
-       if (oppoff) *oppoff = dst_off;
+       *offset = -__timezone;
+       if (oppoff) *oppoff = -dst_off;
        *zonename = __tzname[0];
        UNLOCK(lock);
        return;
 dst:
        *isdst = 1;
-       *offset = dst_off;
-       if (oppoff) *oppoff = __timezone;
+       *offset = -dst_off;
+       if (oppoff) *oppoff = -__timezone;
        *zonename = __tzname[1];
        UNLOCK(lock);
 }