git: 9front

Info  •  Files  •  Log  •  Branches

astro: complete tz fix -- we support timezones longer than 3 chars now.

--- a/sys/src/cmd/astro/astro.h

+++ b/sys/src/cmd/astro/astro.h

@@ -75,7 +75,7 @@

 struct	Tim

 {

 	double	ifa[5];

-	char	tz[4];

+	char	tz[16];

 };

 double	converge;

--- a/sys/src/cmd/astro/pdate.c

+++ b/sys/src/cmd/astro/pdate.c

@@ -113,7 +113,7 @@

 	h = t.ifa[3];

 	m = floor(t.ifa[4]);

 	s = floor((t.ifa[4]-m) * 60);

-	print("%.2d:%.2d:%.2d %.*s", h, m, s, utfnlen(t.tz, 3), t.tz);

+	print("%.2d:%.2d:%.2d %s", h, m, s, t.tz);

 }

 char*	unit[] =

@@ -306,7 +306,7 @@

 	/*

 	 * kitchen clock correction

 	 */

-	strncpy(t->tz, "GMT", sizeof(t->tz));

+	snprint(t->tz, sizeof(t->tz), "GMT");

 	if(flags['k'])

 		y = tzone(y, t);

 	return y;

-- 

⑨