X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;ds=sidebyside;f=src%2Ftime%2F__tz.c;h=9d56a618f2d58c7084c26096bc04b05280210866;hb=7cbb6f70c8fe711644ec0dbede1973cc6641a283;hp=81676d3b6d800e60b98c74feb0f895ed1a2c0712;hpb=190bbb992344e350925bb9ebc37775ba8cc4c19f;p=musl

diff --git a/src/time/__tz.c b/src/time/__tz.c
index 81676d3b..9d56a618 100644
--- a/src/time/__tz.c
+++ b/src/time/__tz.c
@@ -138,7 +138,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;
@@ -162,7 +162,7 @@ static void do_tzset()
 					break;
 				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);
@@ -176,8 +176,8 @@ static void do_tzset()
 	if (map) {
 		int scale = 2;
 		if (sizeof(time_t) > 4 && map[4]=='2') {
-			size_t skip = zi_dotprod(zi, VEC(1,1,8,5,6,1), 6);
-			trans = zi+skip+44+20;
+			size_t skip = zi_dotprod(zi+20, VEC(1,1,8,5,6,1), 6);
+			trans = zi+skip+44+44;
 			scale++;
 		} else {
 			trans = zi+44;