From b134c1f84ccb8cf27b4def83d56163c79abed572 Mon Sep 17 00:00:00 2001
From: Serge Vakulenko <serge.vakulenko@gmail.com>
Date: Tue, 20 Oct 2015 00:01:42 -0700
Subject: [PATCH] Timezone compiler updated.

---
 src/share/zoneinfo/Makefile |  24 ++---
 src/share/zoneinfo/ialloc.c |  15 +--
 src/share/zoneinfo/scheck.c |   9 +-
 src/share/zoneinfo/zdump    | Bin 0 -> 15404 bytes
 src/share/zoneinfo/zdump.c  | 108 +++++++++----------
 src/share/zoneinfo/zic      | Bin 0 -> 30660 bytes
 src/share/zoneinfo/zic.c    | 210 ++++++++++++++++++------------------
 7 files changed, 176 insertions(+), 190 deletions(-)
 create mode 100755 src/share/zoneinfo/zdump
 create mode 100755 src/share/zoneinfo/zic

diff --git a/src/share/zoneinfo/Makefile b/src/share/zoneinfo/Makefile
index 8252253..e969985 100644
--- a/src/share/zoneinfo/Makefile
+++ b/src/share/zoneinfo/Makefile
@@ -1,12 +1,12 @@
 # @(#)Makefile	1.6 Makefile 1997/12/28
-
-DESTDIR=
+TOPSRC          = $(shell cd ../../..; pwd)
+include $(TOPSRC)/target.mk
 
 # If you want something other than Western United States time used on your
 # system, change the line below (after finding the zone you want in the
 # time zone files, or adding it to a time zone file).
 # Alternately, if you discover you've got the wrong time zone, you can just
-#	install -c -m 444 /usr/share/zoneinfo/right_zone /etc/localtime
+#	install -c -m 444 /share/zoneinfo/right_zone /etc/localtime
 
 LOCALTIME=	US/Pacific
 
@@ -21,7 +21,7 @@ LOCALTIME=	US/Pacific
 CFLAGS= -O
 SEPFLAG=-i
 LINTFLAGS=	-phbaxc
-CC=		cc
+CC=		cc -g -Wall -Werror
 
 TZCSRCS=	zic.c scheck.c ialloc.c
 TZCOBJS=	zic.o scheck.o ialloc.o
@@ -36,23 +36,23 @@ ZDUMAN=		zdump.0
 ZDUMANSRC=	zdump.8
 MAN=		$(ZICMAN) $(ZDUMAN)
 MANSRC=		$(ZICMANSRC) $(ZDUMAN)
-SHARDIR=	${DESTDIR}/usr/share/zoneinfo
-MANDIR=		${DESTDIR}/usr/man/cat8
+SHARDIR=	${DESTDIR}/share/zoneinfo
+MANDIR=		${DESTDIR}/man/cat8
 
 all:		zdump zic ${ZICMAN} ${ZDUMAN}
 
 install:	zic $(DATA) $(MAN)
 		(umask 22; ./zic -d ${SHARDIR} $(DATA))
-		install -c -m 444 -o bin -g bin ${SHARDIR}/${LOCALTIME} ${DESTDIR}/etc/localtime
-		install -c -m 444 -o bin -g bin $(ZICMAN) ${MANDIR}/${ZICMAN}
-		install -c -m 444 -o bin -g bin $(ZDUMAN) ${MANDIR}/${ZDUMAN}
-		install -c -s -m 755 -o bin -g bin zic ${DESTDIR}/usr/sbin/zic
+		install -c ${SHARDIR}/${LOCALTIME} ${DESTDIR}/etc/localtime
+#		install -c $(ZICMAN) ${MANDIR}/${ZICMAN}
+#		install -c $(ZDUMAN) ${MANDIR}/${ZDUMAN}
+#		install -c -s zic ${DESTDIR}/sbin/zic
 
 zdump.0:	$(ZDUMANSRC)
-		/usr/man/manroff $(ZDUMANSRC) > $(ZDUMAN)
+		nroff -man $(ZDUMANSRC) > $(ZDUMAN)
 
 zic.0:		$(ZICMANSRC)
-		/usr/man/manroff $(ZICMANSRC) > $(ZICMAN)
+		nroff -man $(ZICMANSRC) > $(ZICMAN)
 
 zdump:		$(TZDOBJS)
 		$(CC) $(CFLAGS) $(LFLAGS) $(SEPFLAG) $(TZDOBJS) -o $@
diff --git a/src/share/zoneinfo/ialloc.c b/src/share/zoneinfo/ialloc.c
index 32aad04..83a0932 100644
--- a/src/share/zoneinfo/ialloc.c
+++ b/src/share/zoneinfo/ialloc.c
@@ -1,10 +1,9 @@
 /*
  *	@(#)ialloc.c	1.1 ialloc.c 3/4/87
  */
-
-/*LINTLIBRARY*/
-
-#include "stdio.h"
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 
 #ifndef alloc_t
 #define alloc_t	unsigned
@@ -16,11 +15,6 @@
 #define NULLMAL(x)	((x) == NULL)
 #endif /* !MAL */
 
-extern char *	calloc();
-extern char *	malloc();
-extern char *	realloc();
-extern char *	strcpy();
-
 char *
 imalloc(n)
 {
@@ -63,7 +57,7 @@ char *	old;
 char *	new;
 {
 	register char *	result;
-	register	oldsize, newsize;
+	register int	oldsize, newsize;
 
 	oldsize = NULLMAL(old) ? 0 : strlen(old);
 	newsize = NULLMAL(new) ? 0 : strlen(new);
@@ -80,6 +74,7 @@ char *	string;
 	return icatalloc((char *) NULL, string);
 }
 
+void
 ifree(p)
 char *	p;
 {
diff --git a/src/share/zoneinfo/scheck.c b/src/share/zoneinfo/scheck.c
index 0fd6fcf..6200b37 100644
--- a/src/share/zoneinfo/scheck.c
+++ b/src/share/zoneinfo/scheck.c
@@ -1,11 +1,10 @@
 /*
  *	@(#)scheck.c	1.1 scheck.c 3/4/87
  */
-
-/*LINTLIBRARY*/
-
-#include "stdio.h"
-#include "ctype.h"
+#include <stdio.h>
+#include <stdlib.h>
+#include <ctype.h>
+#include <string.h>
 
 extern char *	imalloc();
 
diff --git a/src/share/zoneinfo/zdump b/src/share/zoneinfo/zdump
new file mode 100755
index 0000000000000000000000000000000000000000..559eea2aa95ad3be8cbae4afb6bb159055589469
GIT binary patch
literal 15404
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
J-*uaI@!!(97=Hi&

literal 0
HcmV?d00001

diff --git a/src/share/zoneinfo/zdump.c b/src/share/zoneinfo/zdump.c
index 5c8925d..2e87455 100644
--- a/src/share/zoneinfo/zdump.c
+++ b/src/share/zoneinfo/zdump.c
@@ -1,39 +1,60 @@
 /*
  *	@(#)zdump.c	1.1 zdump.c 3/4/87
  */
-
-#include "stdio.h"
-
-#include "sys/types.h"
-#include "tzfile.h"
-#include "time.h"
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/types.h>
+#include <tzfile.h>
+#include <time.h>
+#include <getopt.h>
 
 #ifndef TRUE
 #define TRUE		1
 #define FALSE		0
 #endif
 
-extern char *		asctime();
-extern char **		environ;
-extern struct tm *	gmtime();
-extern char *		imalloc();
-extern char *		optarg;
-extern int		optind;
-extern char *		sprintf();
-extern long		time();
-extern char *		tzname[2];
-extern void		tzset();
+extern char **environ;
 
-/*
-** For the benefit of cyntax...
-*/
-
-static long		tzdecode();
-static			readerr();
-static			show();
+extern char *imalloc(int);
 
 static int		longest;
 
+static void
+show(zone, t, v)
+char *	zone;
+time_t	t;
+{
+	struct tm *		tmp;
+	extern struct tm *	localtime();
+
+	(void) printf("%-*s  ", longest, zone);
+	if (v)
+		(void) printf("%.24s GMT = ", asctime(gmtime(&t)));
+	tmp = localtime(&t);
+	(void) printf("%.24s", asctime(tmp));
+	if (*tzname[tmp->tm_isdst] != '\0')
+		(void) printf(" %s", tzname[tmp->tm_isdst]);
+	if (v) {
+		(void) printf(" isdst=%d", tmp->tm_isdst);
+		(void) printf(" gmtoff=%ld", tmp->tm_gmtoff);
+	}
+	(void) printf("\n");
+}
+
+static void
+readerr(fp, progname, filename)
+FILE *	fp;
+char *	progname;
+char *	filename;
+{
+	(void) fprintf(stderr, "%s: Error reading ", progname);
+	if (ferror(fp))
+		perror(filename);
+	else	(void) fprintf(stderr, "%s: Premature EOF\n", filename);
+	exit(1);
+}
+
 static long
 tzdecode(codep)
 char *	codep;
@@ -47,6 +68,7 @@ char *	codep;
 	return result;
 }
 
+int
 main(argc, argv)
 int	argc;
 char *	argv[];
@@ -55,7 +77,7 @@ char *	argv[];
 	register int	i, j, c;
 	register int	vflag;
 	register char *	cutoff;
-	register int	cutyear;
+	register int	cutyear = 0;
 	register long	cuttime;
 	time_t		now;
 	time_t		t;
@@ -68,7 +90,8 @@ char *	argv[];
 		if (c == 'v')
 			vflag = 1;
 		else	cutoff = optarg;
-	if (c != EOF || optind == argc - 1 && strcmp(argv[optind], "=") == 0) {
+	if (c != EOF ||
+            (optind == argc - 1 && strcmp(argv[optind], "=") == 0)) {
 		(void) fprintf(stderr, "%s: usage is %s [ -v ] zonename ...\n",
 			argv[0], argv[0]);
 		exit(1);
@@ -172,38 +195,3 @@ char *	argv[];
 	}
 	return 0;
 }
-
-static
-show(zone, t, v)
-char *	zone;
-time_t	t;
-{
-	struct tm *		tmp;
-	extern struct tm *	localtime();
-
-	(void) printf("%-*s  ", longest, zone);
-	if (v)
-		(void) printf("%.24s GMT = ", asctime(gmtime(&t)));
-	tmp = localtime(&t);
-	(void) printf("%.24s", asctime(tmp));
-	if (*tzname[tmp->tm_isdst] != '\0')
-		(void) printf(" %s", tzname[tmp->tm_isdst]);
-	if (v) {
-		(void) printf(" isdst=%d", tmp->tm_isdst);
-		(void) printf(" gmtoff=%ld", tmp->tm_gmtoff);
-	}
-	(void) printf("\n");
-}
-
-static
-readerr(fp, progname, filename)
-FILE *	fp;
-char *	progname;
-char *	filename;
-{
-	(void) fprintf(stderr, "%s: Error reading ", progname);
-	if (ferror(fp))
-		perror(filename);
-	else	(void) fprintf(stderr, "%s: Premature EOF\n", filename);
-	exit(1);
-}
diff --git a/src/share/zoneinfo/zic b/src/share/zoneinfo/zic
new file mode 100755
index 0000000000000000000000000000000000000000..cb977bd6845bc034ec32fe0a7863f139d397e94a
GIT binary patch
literal 30660
zcmeHwdwf*Ywf`BCf$$hk5K~emG9posXMiX%31nmfXJ7)z!$%c|Ff%b@o}C8}4G^7-
z<!~6AT5YY>EA?Kz+Uk|s!bOyr5J&*62DF-%s$dmo9BbpF5YRHe@7jBx$z-IxzhD2l
zzt4wh&pG?M_gZVOz4qGc?7h!6ym9s~=Y~j<Ax)B+21$}6<0=^}Ng>IMlq7u@mx9aT
zSY}yR`n}TSODT8Y&oB_47m=I|sKDV^S$gxzfh3H7*}yzWVCW_panX~04u{{p!Ozni
z50qyfiN>Iy{8~;!IK7{oKvObwIDG!VT3;e7Rlj>nxxCi|g^qQG3?UCDV?Qp>QR%L(
zcYBeODsR~WF3%;5MwslL_<c)1r_b;8)ZQToQsw=2A(wZFFc9J7-vHSta5$WGwZ47>
zrpoJH!sS&8A%q9mFIhN~7pPtDsdYI#wH0*?5A2UQ@E2;TUL)aDosva59PUa-g}1!M
z&2v-r+actUPtuPteD@#z$nScffWu+6th6MN!M|7+m_?rMf0-PUIY}=09{n7S+G>Zd
zp=NDewWHqe{fF`dyF~t*tQYymcqWP89F9Bcbem94s(zW^C;cXJa*1%Nya}R=9u7x!
z`9ITdj*yqh8ZAkLljTu+Ck>G2D)*Q7XQb-4>;|qM3mPCJ{LlSlt*?KSeY?HgE4aMl
zWBTh%mM7Fs6!ym@yKTwhQmbvHD5_8C*EKwUzmQAqOqPW{X_`SKYq+f^;;H*SWw!v6
z!?vuIr0qN@W#hTbDM{UUHhv%R5uH1n@^I1bad8dB^J!dqA0qj!-!kaC_*=P>gs>%<
zagD$=J>c_BulB5+?rNxZ0n_hNT%<?2^Ujg3`FS}H-uu`yQ&-J>kbEK&mo#h`yROzT
z<>3cinuw3$V)BpbnS+bU&|LiX!u*E*x>5g%2A|(uGwu3m(8B|J(C<oIRNoBP!;B~S
z5Mi><h2I4WT(H0e3tX_k1q)oT!2h2XSf!{RS#Gl2Xjx@hxk9<;(?|y9JL=AdPsigH
z^&3SStf<B<SR>iP`R)QdwBn-{Ns3)0k85TPwrN8^u?`eg^<zb2jCS>lNCnns!M>`^
z(}R6+|82oOmmI1Z2hqV|3uq-dqyll~JY>Y$<#A0UFxXcexD-@Z5S9NI(MFI}R8&mU
z>kIa+lS7vyv(uOX5<_eYR9Xm?Y|bH;uzf<j;9y{!qJ^meidNLFg!2v1J2C<Kgxcih
zCa%QGR)`ObRKmuOFe^d}o<&Bd@dWM$Wp|waHY;Jpps1#9<SOCfL-bIMhw*?lI`D|x
zca0>yRE;^OR&ueSM>X!EGWB$%7Wrv6U##XlgN(d*UR$JjHke6)YjT*Bm3l#yUXa5J
z=IaH^^@4O>FcSqfr)(`aA%|_4j@q326*bg?cG|<wb<;!3zp{jMD?Wxc341DPcsnyi
zh%92)CLFY*pThan?1&6CLv8-aJnPStwKZSp*}!V;h>eH!lkBf(#zXT!qGiK&Pk_Uw
zLXF3EkZ|?M-RzP3%6v)cGVaCQ05dCH#yv>Vugka_DY9-WttRa1UlsL_kxbOt6?z)H
zj3(5E6fwq@RJ25fqfld6@ivt`?P~7rkfIvb;11!d6T)vz6|OPGsE%i0O?yEEUWi$H
zE9TBrdE_<S#?NBD-O2L?lLf*>2QUyMblj^m0jc9Qf&>OX2<1xiKD4VboBF<`RVsm=
zx&8jBXjwm-3ytkti<Ds7pi>7*>~d+Jr4znt**YXP#Ikjv!4~goZrf0R>vBbIZBsN;
z1+iG~DY9PP8@ptHz2(+ER!3y#Eb6PkE0EF*ZDzwj@~*aE-xYH6M5GmsX|_ZyI&O>a
zw``Tm)W6%p4ufS&8R*)BedFcOcC-jiVnAhZl3nP0MeT`QF`z!1cFikfok$q<#f=9n
zj7SOJY}lGXvYHPC7TC18XyzYLq?!JNdtRGeJ!cOa6^yaSQt+YlHDU}M^*;|{&D6=L
z;C3reX=DmWVn3009SWWq@4w6zKR{|cS|N`k504+Pt9>wSY$V6Jk!^CTtb`89&5xXm
z$K_o|f@jh4`;l%wByYJ09)(KB6-&}7>(=5DxtW|ST8Cn4U6TLOsL{gIiAq;`I~ocb
zyrF30l+ZED%LHv|TyEZFMATvRm*$-sz`sCloieL5^p_1|ZO#Mexo3;0%6p2N{KKtq
zs7v837WDweMl;;VBDbaw4z+E_R-6Z+UK69;3fduRSEM%&1O*2IS=Toe&63K(>kNS>
zz_$^6Hg$-i?Ik6bgd0E3Sft(daYk9#HNgNa<&XzWD-C@pH)lf2;9fRv(5+WPI=c0J
zxU_$jC2XDW_h6q<zV|6=6YH=^CDdV)ao0O+C+dp)8}xv3mm(h>ri34(SYlJ(wQFoR
z%b{je6a5Kp!p9VC4tnxSR2P|s<tGM*-=`@V!83#8=66tA@QgtYy<|Y^pv2cqiEb=8
zxf1_@;GvnG!d+KlCW1)xiZn^u0~XZr80#GMeXDvh@;b(x$|8fJzTdA}bQ*#Om$#D1
zyD>>#F$@qnG=oHCEkHhb;TYzHC5#HX{|*iqc?u*6Z+{#hZhQwLqdyQO)%Pa!w*<dQ
zlS6+(Dq)8W8BOyLD^e}i{ByKM(MmF#=16jLHU&DZ_*XQ<bDqN;LFK;bs9W7%M!lFj
zCRt)8N-J6EfwItF<mMr)v^XDpiZg#MJ=#wim0+hCgqx=UQfxZ$9VAqv%&1J+c!X~-
zs96lRpD^0hq73!6j10T#%E+{<)fw66YbBiL3Ak_cB>DjZEp$DqMx%%IH&70pLz&)1
z+WZVOP<NB&i&&$L9T<ZMligp(<C?J*Kn?XEt!Q_b@D2{=Po*HRBAd}=e?w)yOhsFf
zt!RtQc5VJdyS8|SqRpS9sOb}w@Lm!XnLw{2?d}Y;+NQTUmc>LI=i(I<P1B3Id6Ah(
zFa9fhRdE{4q*_&PC9GEoV#`!OvfjTlV&fr3Wjc!ov)<=~tIkv^hOQS)<eK4~q{^4d
zlhL0K^a4d?qY$3;d-zdgH?)A<kbxP?cnis)dOnAcyi<Fc>Cr}3CB@0FP0KM55kP-R
z+()4n_w5Z})J%8b&c=#O?TLI&I%`?AOk~nv6&`*&qlF$ZlC+;m67hU5K-~DZ!ekE@
zeJ5f~w51ONpM{EZAk$2eUNcmqcXX5#<^=CDg7<OPhw+s(?3Q!&-atNvUGzoJ+nvSD
zfMuchrg?}`w^2G=o0)e^#CvTcNaOyCF?Xa$7P%WD$XH9rc<~O~JqLEfUiN~o8{f)1
zs=FSK4m;qWiRd8aJE-FFYr)w+D8t3CVLXYZMxUj~uXgZOjDa$m>ASe=ttg{bY@5Q2
zJQVr;!6S`P!L%)q7V&^25j@rc#Ep+!muy<}YqW#{DYNH)p-eOFz+JECQhEoD<)tmG
z^ns+(4=F$yxf=H(zh8|;Mg=v7k{TaOPEz9-K-@SQ1WBWtzeb`vPodeK4l-q#He#?v
zvkuO{=xPO)ghSfHPg4J4E@;<y$PJr5Lp+FBAQxsm3=iP?9>;`QGkt(NS`#j=fxBY@
zP^KP_HlGzQ+{Anxc8FXJ0W=;)k0!esRR~fFv;CP=mLbZnMwxh*`ETOYG_Y#!=GCwX
z#y->(`HbE<T2>YE`^`dY6B<+bU%-7LuYx4eJNp6R#&7VJ!Hb{Gh2!l?VVEY)^0s%s
zipPV+@1YP&l20!JjWhoYk%mtB5s!*@QaWt958Cai1W|;fX<08I8<W7@CCCaL-E>Xf
zA$@%U%^HZO%Q~nJg;G~KLIp7DbY|U6CC1%^3yw6trKk_lyxFSd--m+I&?));zoBfv
ze4|wT$maYVtTvf=tBzDE;n^_UPMRaz!;P7lB>0F@b=0JUZ|lx%v8b<=7JRia+osJ^
zv{{j<P?wfP1|`^0i5K;8*nsLpe80a5by?Np)=3dHL=$(m8e_A_mr77nnirSHq2s4M
zgYjfjU$<$EIbh#Oujk0`u@7ulKgWbL2X8}C#->_x`ZOlUf+QRyOnmV!#o4ah!#vMc
z(AD@n79^t4KSDWlmA7TngeLDpODk22V8j%R%lCf<Xb(>%zs3u65ynJCi=yRx7kt+T
zF=vuPFMwi^W}Ve`y=I?v5O2Uzl&PkLxMN{p#e;rb#_N$nCGkaC<E-QCHDp&mi*%0y
zw`!f$OWBduT#!cgU;`b&+J7rEVAkL8s?toSacACjFR2nXuEHZyL6ln7pHU|KaGqv*
zSEsy_NalmYrd`V?)I|VsqaOsApexQ|S|i%-=_GHk6?`La8xQ@0#WX=i!^$(^STI4$
z2&y@0{z~l!36@+LFnV~IL2({dst%1&!uD4)(O(wzZA-zqjiW5#8`0+la9)*a@PABG
zP&J$hCae1Sr1mc3OsWaLF5{F$>PnH4?>~}(N<1N=Cw{wjTN-Au?Rc|G$ci80=@z8(
z5KluTNWfu`qRva!SKYe>IdBpZrG(RmD4uSTsA%b<HT&ocbXp4nf@*qz!a|qvhj`Gh
z%NRzAI!&{VE<umvV|`f<8FqE284oSrhVsJvg}BT2{~jC|PT44k-iGx!UM}>Sg=y7y
z?CL}GW?7{93n#)^3TN2VzoW+sv+-i5_wqw+@~-a4ip$YTtVi*lDpQ=MY>37CCUnSu
znG(+W4pp*i<*0bUKL7N4&Uo=|QV+}F8uX6h#A`TzX9;mncpJ2z;1#kZeN@<DP>n~C
z9;mim-AhU?3R?@a7lrMGGwfQnT`RC_OvmVUd}<mn{_Ww}qtRj-VfJwKXiVXrqp^za
z9$kX|q`?T4<;UBxoDxfY6uD3|k&$g1y#-bPR0Q0?;W9vb*fn~NQn<GTY5B2G6Qi(?
zo(Sp<BAt!&!<6Q>?FzX7=%?FP7#9(#lE}EQjWWUv)nAw=|8NwV1S{Xa4@N`lZ$`FV
zeQX9EYH#p(n*2~`F4CZQFf<PdcoEiIv4vRN&R4C)H#fHl+aUB%6>{@j2#V(5R!rLq
za%jbHNt)jUQnU<i#i*j+rJ`{qc-u{xAR?5ap)^d^(}phARu)V1wZ>xdzf43H)pQZ=
zikdZ=KyeoC^9%jO*^NW!F?Q3KL=91TX(s$@v36Ur8Ot*N=B7f)e;1q1<^KY2?#K%h
zsNGvxqvYnPuo*AZsPG|CNKMB=4uzN)(w0bGn@#<Ln7uH1lN0oKBU9TWyRIM|-;Y!>
zc3~Jf^d;80Og}VQx4`0XV=-vIjNCPbc-|Ali(%6>ws@z$hH*-^U{|HBpi|y<1X4sl
z+SNA^hqs_gyT-c8uCb1b(W{3v0YOwnWi57%`=-X+GPVH)i#7XP1%5+4y;QT#U52`t
z55fM1gCbZUZv)B|EhEuzeX4(CJU*EQ8|Nx$HmjA5P;CB?@0F>sfmI4Uh3DDSKW@AY
zvK5d9u{crt(B<Uo{y~_l7<v?KC^XwaH5Zs9tb7ATgn$i`u#*1-Q)YM%D^tHvChb!S
zK3C+@!zfqeC5Lr3zR#jb7Pd<mYTL60W?=Iu`Th>P>uK~R#Xp-?G$GhHrcd(M*)+_%
zR-+F4nC({Fo`&l^gi6&Mn)hR$@nJlys_AD;k@PW2q47o}{nsF|iV{;H=(yxh&x^+f
z+ts*o`hEMP9>vgCiox@6yS<=WezYUwRjXXuX_rg8mE=xVg8M2J>f~y;8qseV16}Rv
z*)sKAoAY3qHhY2{OC31TTsDmCg=}gfKiWPlOmTs2)?iuxJ9t=d?{?%!a`Sey9E9~$
zzAX*j6WmK(B*|OuODbt@06;I5phzsCw1<cet`d3oQVP+3M8N$|%xC)p?vp@zz%A+z
zxZfa_@PKQj$+@<d>Q>Yuio0I0=yCUZNb~iD9-sImWnc)nc<y}7KbIoFNYJaMOxzIx
zMiIy#O(5Z<%#V{il`Z*cBu+3(($aACTxBslU4gT4PcKM*w_x-|zPf}oH??C1OD~m)
zP?*x9jqtmt(GtIfH?{G*(TmVhieGt$Y{8AB2`4Zs&O=~bfJwfh&OVIf-H?K2$J<qt
zi-fCRis6PAOBohdT_M(6ybowZM{QUXC*l{z6TKn_jAFEc#(1GAhRJl;W>8-jgG}CL
z!USIr@`$T!5`y}&sT;!0X*;OjHTHgv<+J@Wfdna5Vbo)>ih<dXungJMUb}`S8Xuu`
zWZ3jL9`Y`024tIff26l#I5rHm7v#=I8Q#sBX(keO^#cr8d%=mM0c%rVQ!x81+$)jj
zZ9d$^)M3E9rZFuOi<{>t$f~C!L&uRn?#JkgoVyIkur=MF6jNZ9gK6lJ^SA(XyY?z9
ztJK~y^-SbqaKSHZ>U)?K<RU*Zhve|Ro)Cr1roG)zMe@5_;bCay-XnmqEU|v=Oq-5X
zFE4_7O=jXc=mnGCnTF~~$(M8J&EkKn^)DEWl#v4}WOPJVVwY}U{6R4kdGtys@;un|
zO{Wh**qVv@^NwP{7kL&%Sg2pYtPoe)|C(*b?%PqyMVx8>D>jWzMmiD@vyhXK-vU}y
z*z{!N8O|P|*)gMM>_1M>Gxp{LWbA={_B%QIa|78|Cg>S^X#z5K`ivrKpNwR%xB}dm
zn-@>URR1L;rA>G8_y4tI0?{Ig2_eX2em<5ICdg!d0BBWDQ;Xg~68(TRn+&;lMP?`k
zZ#KSwwcf?8>?Ip69>ml=5m^V)U~vo!EmWUh4HL5Jv2a;~S>vY0f&EdY%}p{<JyRfI
z;qnAz`YZ<&ZCr??5;l&+d{S;LN+T6#BkOtqe7!jtxr)k3U!xO>*n*wVx1;d^=zkM1
ztxpnq(>mU+o`|#}^itn%!xJxr&>8kZ_&Bmo;3%+Gd=Lvg3{NwBw4hJkw((00bgg(3
zaw8T&I0&O7So{RC&|0kHUdm>sV4G!FuNfOqV%Lh`6L6MOkp~%D;7a+wLvLZfAy?|9
znOq4*GbXz6$d6H+^!@~Y0aKwd8?W-&*^zOay^$@Vj8myB*kQI6>~DM!pAA37B1`g@
z;cMMubhUWhL@wt%<Gx+x2vA-Q%E(xdpkdE}ALC^tW$i@B#sYU~u(*|^vRO!9<OT}l
zn(<}Kz-S{}%es?TG~<u)u(f|^T%_5}nGmrPJ%UZf5>6gKDb^h3?ATP$ZcZ>yWz42)
z=n>Aphx3deo^Y`W6j6|Vg*-0O^IfVZXFlUCM8&s&Ni*HbStB5(ZMyNS*29c8Yax}<
z_P3%HY9<S(?B<pHCnK4~*QVP6;>I3?D_&PMutmirG3PCsacWfECn(iSpW+Tp8+dg+
zm$T|_<<${?e|1MWCHXY$FekaXJXW2D2$<-rIO%hcri8;39`o8t)!s-N=(s}1;8W<H
zbBJTn2xc05hv+8oX{K8^_eu01EHItdcaSk;l~P&a1He2^NnaJ9(vu*;E>ZLh&3iTD
zComoF(T7nB+ITl_+$NHQU1(?(t>L7vBuHyGX*MIphDe#(7byb+*E*NgKp)FWIo->=
z=E(_)v;@T!oZ>}L#PWFaGI>@RXF7#>JjQD@`ggtgz1XpUo<HN|Z__+qE1nOg=mF3~
zegUsRyDmy7+s5gCWCq0*m<Mttn;4%lM#g6j{WDJ12;;}HA>c@&WHT>OQ3Ct9!N^4v
za}iG`2yf(sk8#2xu9*#)(aEIQ5E@S7nsArs`~m8yNw8kZS%1!074=Bu+;{Y9-bRYk
zZ_ZS-b(yQ9OCWh*d`+BZz-flyr<peO6gF<KKyI!zNYYk0uMM9Io7W;8I?4t#zClj4
z$PacY^sUs~rO4LzVbU$A9gz&Icn8}?!!jyP60G_Y%TUzUBZr_$u+I?4>?(bWn$cC-
zLyy><U|y2UJc2QI60;I6>){eL#yu!7RB*>;fh|Y0`29!^?L%Vp2_Ad6^exV}g7KvV
zO0AmvEqt0OTwkb_{wdfuX8kO!tS5M;$T!(?s>{H?vvhT$i{og}7gcRVSa&_FR2?j$
z&!0%k&v(YwV053tbcYYY5eO@qX(R=gaQ@HXm3eKL(M0aaB7&@Q6a^B2q>oTI{|AgJ
zayugtf#fEDxbcS|fX2c7nYUVQv)pcRtnSeF3ljY!&YO_g)Q84GQwv_i>er}bp3)VX
zfebQeSLkA-2D22cl8r1y8;0pfSzb<~``$rxXYb{_wiuS1>@(5$i%DmENjQvRtU5^~
z7ni|=kT`P0t`Lc%Dl9LPcnckjg*Xzun<Qh7`5BENHEaf<W{Lt}dj)A6FzJ9H9)}^A
z%_E!O-Kc5~$`)xwF}|gEhpxyEAWYt+7=mYffh;B7#)=hu3NGaoeh+4%PMR*Vj|L5>
zM>E|`RfqF4;OU5N3(4lkF!&<mS6Y^vN)z$T!D&B(n}Fm1ND{l?tpIW3DGak{BfKBl
zeF>6t<Y{E1r;rE5ON8Pm`m<i7@gfC9r3K$u<VQO<&c=v622tRsM7Cyp8$b=!BaIDZ
zyrw&_Bp^`Gw{f)EX4ld?Vi#$qMo>kcff3M<$I%|_2@0YNA{x;V8)6TeR8~UWjxQ1<
zo}_>P8-^fI!p1v^;4yL;{(&%yq5x*$^U-XY(40XHTA+!No6xO_TH1|oS*RP6=xL!t
zo36%s+6cJuawNVoW7dM5%_EBE=x#77TK<d3QVOgy`!;$IPk#kOd+hCsr<Vv|nhfk4
z!)kuNMc(xuR*zeV!D)I75BA~kLBgIhOdPft!#l}u_7IHJz^ZDGa?k!AAQ~L2`S3u;
z--#C&@AxM0Yo>ciN;qG}h=RS=qjAwe?DbRJhfy1u4oN)vz5;a;>$!pBEBI-4nfg0L
zebuJEWm8Yv)N_zXCwuJhy6+F;&A3fbS0A*iHQkD~I#Vmju&4_rTDlgLKtqW(wHhc0
z_M#G-dH^RHtU1`M(~mSfhj$O1xZp<`azGU9TOXLMv&XJQkogg4c#!!|D6W~Fp`a7a
zzXnc^hJA$gMN2T`f_=WgNMbag-s?N9ljB772NYvl02++P($l6cptA=*U@eG8o*&9v
za49=}fbEI5z^WN%qXIM{JNgbF$oIha>APDzvdM%DwH+TIvsng0xn2Dv@-<dM6wR|O
zTB%fM?8Ojl98qZe6i@m72Ovb=W&Ak+(X2&_USX3uniTyWxti%6+)<AU^`J%9k;-k6
z1rQ2~4k}B8&b^${&NPZ#!AL~t919RPt^@(sq82Inhfai{*hTa?z7i>om!oZ{?$>Y_
za`I;o&&VCk`XP)zKx1|Y<85Y+TnLI%9(bOI*HFtpj`&6(gPCG1%MhmMl?RyOBUqYD
zaRN{I{zthfS^#uY{1$I5-noa7tC?QI9rfITdSD6)Y%oP3gu)cNsVrfN7dWMbX%xw3
zB*GM<0OCd)2)HR6NXgr79t2a2wP*{nV<X8RHvwzL`6xqwjzx!$)w1$|un)Fv3d$_n
zlI(&b8wXp|8?)6TS{5C!E9l+?yh>8L3)&F~w4AT9b^V8-STl{l9s2(ao(%nehJK3v
zI~-EcHXg)T5C6=9c8rql04Dx9FD6*uKu>6<Be;Y0cFr0i)=IG2x)zvWH;7o>9lIFT
zP{|1?=+f|oN1MTvOJf91{w@V9^yO6;2-F4~ETr)`+vZ$=Eh7`ng>X)62C`;E6|lD!
zkz_Cq8cDLc@R{8|Oy`Z|w9Xa9e@306*iFS?l`Ne@a6)O<LPM~xSPnf*l;M1~4uZUu
zLXk|YeFq68?CRIC>1cQx#alLUe;aCRrXErr=R@JZu-R|Wp)oI20*RDgh<rYOiPLx`
zpW8HpWiX#R8)<}cV)zXSwQU+@b1tF%u~BGjp>^wwO*G`}i8|M^I$gZZ&*3Sk^J?xy
zZ<0@IS<9#_;b)6D<sU!^<L_W3!q1)oh#ODPXb$erP725LenahiKCH6kSU&w{FAz`%
z9v*iWGEv2MqB!!4L~b5ZN$b~d#be8hFJRV@*LKf2ddkf-M$v+11P$7+uoQg0ak%AF
zdzwEh?^x`H7EAmPLo4!*MO#2>qc_#zaiQ1^HubQr{gZi$dRS>cn`<>3tvc%ZjloiI
z1m|bl&s=3S9Pu1#K|fmx4#^KD=3nxzS1sDbTP*SRSeXrbiJl`|)=@6&2v{NONYx=G
z>k!V;wx5Npqn^Y4vXb|=AusQ!W%9*a=sTq0Ak>%H^v9xpuH7^dop4L3`a4VTqqH*T
zi89YOR2kMtw)Vc<GWDFT{j+)V!y{&(wo>)amPxPL+T&Lt<65Elq}QzB<?*~@r}i2A
zIXHCZze-V8bt~$|gL#Kyc~;Faqcra*8wdUQm`~xYBgp8O+=CsZI5qcBd&VEIiLHc3
z*p&7Y=~!OBfB~vF$6}|p<3$<{7)7Nx|EBiH%}+ANwHV-p+lVT>a%(yb-|(%5NgayX
zm(;(c)o^UcXN&a=YQ%D4AF3>oAL_DZyi+3Y!uDm+W~Ke(bh~rqb>G+w`*0e7_(o&4
zI*u)0`p=JozXZz>rgB?JMjt+d;iGAZ(tbQ$ai$Nl8?dk6j@|r>V8^+@y%d(n40df*
zw<UPi5SV8Pew`C2AeRYTQEKS5R2_7|0W2>etVw~(OAV(jo;Ro`t?J=Phy9tBmk_k1
z;N~fV<Phy9TH>$ToX21itG0fMCA=VxaVh^G7bVz&+;FuLUYxG%$+bN&f&Q<k2bI&G
zC~CLT9+{^cIjf*$Rr`i0liFi*aahTAx<`3Yr?q1OcRKnlTHB<y-NT`QeNx+tH0`!e
zYFA|CpyFIOTPbMwFD%V#+k;`!KfkdA&lv)j&{kLQj8Vbnv`t=m&=T*6jlmSi3N_=e
zVt*Y4SothDjOIX0;4qnU%PWvm<~+)VQ#u^z+J67n^-`Jt8``Z^?XF)NO2K*&`M+Ub
zlKaz_)_yn2szSI|42KsKj(uR`8W^cz%qim|h#iK&$b$9R0Y5@X3t%iC$8VZ$Fd(KZ
zodXRw4OI$^n^E8&i-=W=1P*o>l!ASVT>3V(K(@V2TBXLNocRcKJow%MChY$(*8B)2
za|k0&yar-+#LKY>vYCu*HYaQ6WVaAmF3A2y+OtqToROJ0*(02+4}lpWuMs@}CC?y4
z^@r6j35E0T1tmysVI(4~E(eGkw}OBN%FBSyzy8Dg)TVxePrmFVB(0%v@J4R_H4=91
z8kP_E1R!RwiW=xH&HKy1_5OUhb?g+l<|T@=0}C~pf%4<HL-7&|<0YncfFyld|CIGC
z;&}g*^-ho!bOf^JHx*66Jfg-BcrH2<_38SSY3u0~m{}G&6}Z=~)pVC>0XiB3EH@7&
z#c;?K|B*mx8@<s=4`PBmc0#{CVOAL(4<>#7j`gM50g|Lc!Bqp)IR=V?4mtD)d{xm(
z+i<|rzY(8nv0-c1Hll{I?t$%xu*<NnscBA_;F1AVZq=*An^m8*_u*C8Z-GispavM>
zH>k0@3I7$p5-u5JSI=O=5C|*5jR!H!jIhSh5Rw8}umOy6fQ$mI4$7gyv|7Wr)`8wi
z@3U{e|5TiN`kZ38-I>1&(bdko6|!C;>6<oV6aPy1PTn!N7tPtI!HM%^wt{&9D>`(R
zwcvQ55UatjL4i~Bv(u3ND`vWip%W*%ab78shlWAKA8A?!EwMXi*8<%%@j8Th5JG5M
z-(K)#<F73DoMT4`!tGSx{1Tql265YIS*{lKBKZ)6Shq|VY<K1khR$%;P1DI2TTs@3
zS{H?jCSo>YQ{RZ}K^(&j&V-ZfWd$F>jE%=)*swoSTJTZeI-%MVpn-L9I%<A6{i<N!
z%#Gj28)*gv*$p4lCi&eUuo{XV!6?S@upiQ3#^x?HRV!<=Zkb}R#5=8O{yG$3IXTem
z7}l3zeDh&F8x)%98YUpW1I~^h@dP3+8~vv-zB!qRk;$CwQBL*{$S|}wVcmhz|20L5
z#H5PFjc|T5C_!>7BN3y2B|zM`4di_En}J&rzl1;N`*UAmQHs7-!Z|?*lbdPz$D+Zt
zNYFxM9SILNO6jPGj(+fItlT_?m7l=L!`Rq<|G=wpP-lrDm;U1m>>koKn%avw($-6q
zaJ^wmcJnd0`5Efv@FIh}>+4`VH}IakD=&C1*S{ZpSIfJ+hTyrY14Bp<34olfqhh1=
zc(5fC8#h~TFyJlRe00Nbx%G=+XLs=2&~+z&bE~}Ti{QCi{bPgYD*eXbx$3}VPJIhe
z$8y>GX-hWovz+E*{!#L-H-l$a2coedTiz7!FKjdlMMD-0t4=AmbFj0sghu76_i3qy
z4^-zO3Kj==H^VFJaC5tCJx=S}_n1xoj7bc9qJQ%(Vf~gCvVSP9_OZUfyQXh-^i41g
z*gwE_>4R;EZx6Ps@r?G}D8>jY?Nd+T-n%+F|6BB@)L#Bo4CQo~ckt>c#cV}Ay*e5o
z>i+&o>VFo}zs5Ez-kSIiY4Gz8r=?5?95%I+mNLVsQ6vH1E$4@=R~kZXNfjOQ4<mYV
zlo-C^<LfO_INVE|qv@0BNSpJVVtAkIbu}yMIsbm-jVs`Utex;g|1g+1Lh&Hp7HU)5
z5|)bmk_<uOPvPt;#FMr(SYK!PkbV2=4r-q;!41e>-O&=y-GO&xJog25|1G=kV)xzb
zzK7jkW_S7zlj6B;?7olP_p^H^yB}ot!|eVVyT8uv-Rypp-QQyOx7odi-T%n$e`5Fd
z*!?)Wf57e^vinJPr#VDC_Y-#il-)mL_g;4Y0(S}@Ilsm#&axt&`wKi<Dk(F15{_Dl
z;2}l-M5(JNb(B(bD0Prh3n<k}sg;!aEv3pS^-D_CP-;7+?xxgFD5X+r8>N0qse38)
zB&9Y`YA2;?Db+zK7p1x>^*u_xN2z6$`U|BNQ0f~>6;Wz9IyX9#Qglo#I+0RWQtC2F
z<x`6GA1ket8b+z*l#(b_PN`Gah^wS83eis~MLVj|4=A;bQazOVIi+5w)DBARrxdwT
zbPuIor_>Hgy-TU5DD^3&9!1J^UG;VAq+H*1=CV4k+w89_uQk`zy3JEv=DK>nr>@rQ
zt9Ls+6&|;1*!jq+&qG$s|I&l6vfS&Qeix*%zvn`A%rCFK%5Qd7x;$R9zs}4A^1NzK
zZIwCK$8x8;{m$vtb<Xl?zXyN2g%|_A@;lsSkB>-hHBVh<UQLf`bApOzxXh63cKYkQ
z4J@O=Q|+$B-+wVrn>Nk7dYBZb^#-aN%%l^<nmx5<V0X3K=M#A@Dc5yfuDDZTe6DZ&
z6f?AQn^A)5CG$k$F;{r&YRm&lCrMK!pTE4;Rqk~`bbY`td71LOg?07rTC>C?`RnSS
zIsF|TM#jb0RhR>{Rkd~NYt8<Kdfx2%@>-AcI<u{IU3s;~Wv+JM86Zt~UzB>ibzZaA
zUGBmk_2Jg!S<dP@AIoxYK=1k8E;Ig8kKa=pC}&;Dl&G!qn=9%9wJvF?%Vn+&)U0)T
z%~0a|fjU1Yt10(Z`K0w;Xqr?GSEzRR;3Venk)wP|FxtemU0Ajf@+y38e<G`V?OLyU
zorjCBsPop8`=z?t>IP|1c`Z)J&5+J7((JBvnaLN(14!@k3O|%h<U;Ful3N$>F<U0;
zt3j(P&Ex@zEG7mFuJVRN9(v6S>)c^(aF=@%xe%Yo8$e;c112X0*l0;6qmFZ#$@K7$
z0m4un8J8)PsA0X^T}1^<L6{&=?ro43xYv4FqO9EOtduPEUQe}D25lDw;I)h3zmg?z
zM*x3!X@$EUe?tY`CM|`_({oAPI-X&5J9(nUQ|qY-)JQeu8`!hD+~=RV0=*7_EL~RD
zpI#Yo`w|5=xm~qMaAjq{+h4fA>q!u<DE9}vgoIcjQ5V)PCm}*`Cl~`hHyLN<^qB=_
zjLBN~R<*mlek!wIZ5{O$<@4Tz&p0dHJ~nbC)|+eHa3#0-F1NQ%T8^>FyhySmqWlx*
zB|`2jWPKI_Xj~`y##g=$UC9E_|1bh*G)d!`=OS3}!Hg(C;Yoy0#6fdSz#k~DM(}ZO
za8?I=o^@`?6{xTFIN?bw_%JV^_%@NER%&SZ$2w3uc|+D#mm|4g`O-2o8>BQwQ%hGa
zJzp6Gq?+>D1|CoOP$OUV;V3CDnPNty(c{(>PC;SRoIIra$<2Omd9BYw(Z)CLaw*`$
z`1DEWSoWlT_4ud)gffb$H+iaEh-1D$HDVG4R%cxe^l`yhZfAg`ut2Kkt}pkQugdjZ
zHAUy43_U0=AnUQ9pX-|rbLvV{$OM+wGg0DA#0D~toHuzr=m|FqsW2Q~;P|v7(UuiG
zv0NJP{6~3MHVvTD`OZgQgO@P9*ztc>4;CMZzwd<eGvaS2Nrq9w(+x*%HX6)WX_X+K
zF8bSX^ee$dd?Tcx2%jWL8q{RQ-;**+hWhc+p!(U8p*LTW>aRiJwNl!$YbAW19K;B*
z<YYg?UCSlIhD<}|h#?uYU-$o-FU0)Ik2RRDkwSNhr(ZlbiRTvad_X)O70;){bBB2D
z5zqbN`MP-ai0235`KfrG5>II%uYZ_$UM!xMiRVP|oGG3~;<-RPmx<^1#M337wc@!!
zJnt3HZQ}V8@!T$+zZ6g1kj-|kmyT6|S?3}1eu1$(JMVAq;(`1N1lIYN3as<55}5pn
zezyvY{Q>rK2#iG_`?&-jEU-u5Ap+M6OlKhIcbCAJ%d_9T0<+0Jax{U5i}KXRgQ8r|
ze^g+-J$k<W{GaHrS;Xz5w_oSepZ}3k-;R{}UKUvAKP0ejzaD{g`<)b6x8D~6>-N*@
zO*~Wje@IIIk4)+R?+C2dZx&duf0Dp@{WApqhxI2ExsbSEfeRM6V1Wx3xL|<`7Pw%6
z3l_LwfeRM6V1a=a7&U&*n(>zU4E!&<X*h0_5O6T%4bGtNRMMyt`~`4#MLBkRmSa!T
zPCNZ>=>~6R3kvWz^j+A5sh4zsEpkd@E3Mpnhe+X%#3Mz2!kYcbeaBj4VEeO)zW%VE
zp#}AL=TJ?KnsQ&2m-bFuByS1J!EThN)?eXpR#s7_!ZQ7J)phG31R2YaQSNl&vjCx+
zfuJEiH4s`uh(2Hts046t@c1cRk8}lXyt9fn5MrB2RMuo5c!%511a4u7z6VfQ3qxEZ
z!VhyC@U!Z+GvswMp-(g5!>%zA?qFy=ZCerCO%PSUPz2i;tYI6NfCmYZl{QdeHzDj>
zGC4g2Y7z}R&Y-)-S>HgU5eBP7gL?_#Un9VG2P*7iP^j882xZ^*)p=R{TL@u$O}ASM
zVV}=gURyz&4>O1l4HIljmRd`%nN6A7d8XG{gD#i6PwS9tvO_?8(xKAb46;8XPOyz&
zpjI@BJEp;bzqz08sHsFJ(LSOZ|CT~IIm(opa!;)^!-tJzXO)!ikqT)IpC)Y|i~sz#
zg+2<W3xnL^loG8787inFerf>C7SIeTmul-9cng1IkOr})ZuavG4OBZol`b7;_ZF4X
z+qcra7kB)&k8QHdFmF#gKDcFg%dp<Gmh`4H^NblShGkrR(#ge>?0!uOE&{GdGe}h@
zb8jR95;_ex+9#xR0M~>hOrJZOap^yznSiUw%yS4Y!7Uk+yzSGtJQ`CZPsd0y{u!K|
z)k*xxnE1N|KYdyyejV%l<`n*9O#Hoq|K9|^j&=U+l)#T3RDUui{uU@iWl!Ov`gKfs
z)c!SM!-O#LCu3IsEYAO5g1=W_oxeqFsObF3nE0CtIRAeOejV%l^tTo1r}HOcrvF@C
z)&?4;zrZ?wFD3BP`I9lLzl4_^1P$>w39R!E78_VPzmAW9{z~Yk|2rP<3Or*emlq*C
z9Dko5QJr|d61YX+xWH?c^YRfOBKj7A=~NBjZh<coc-ab0Pv<DE9D#Cy>F<yd?h$yN
zz{drqL+Vr>5qPP<y#n7TaG$`d1(tA107=OuaE8Fu0*?^bFL0*7^eLX|yI9~K2%If2
zVgf5S3rwHsiGHHMPYOIm;O7ONA@F|-JV)SmflCBFEU+T*?*(2a@cRO<6gVO<{hK*R
zN}mgSo4{uUUL&vpenI*kU&ZN%>3B8A7wPzRj>qcQ!SNLWo7Zqmb&`$sABqRWw~5F|
zj(2&$=ZkMG*K>I_C}-nAU=mH^nGW&Lj~+{KOUD1K{s819*S`t)eD!Bqx$HfnejV%e
zo2hdA^!m*VaZKZJhTx|^;X?ZBSm#fUpQL{>CjK>o|24s{<NsU!7Qz3v;McLv-;$&+
z)t`*1esd{r%L&1+W1W9l3V$*t{(8axso>YK&Oa)JKN%<Y-<RMY2`2r0bXMTR`vq~G
z%JuifP=WRMKT0p3#oKd<z<PY9KNL&+Eh64d*2_yc{cOTX@v%f;Jw7fboD?5#5?GIq
zYX#QhW1U_u;^AEa>+$g(f%W(pCXDf^$H$)vtjEVE1lHr@uLRcP;|l`o@$p50_4wE(
zupS?~1lHr@8v^U`@g0Hn`1roSdVKsuU_Cy5C9obJ&k3x@NBnzOtbKZXyhva@K3*cQ
z9v>$NtjEWx0_*W{j=*|+yk1~EJ}wqmkB=(_*5l)9f%W+45?GIqH98jYF`#1+A2;h*
z#K-#tHm~9Sqyfu@Oy>PG79MA~KR!Gyus&XYBd|XHS_Rg}(*c1qtz7==0_*XjM__%v
z_@2Oed_4&aJxCSyJDY+B!}pWRvr@1*1z(+l^HXqf3NB5-bow;8zU3+SdntHr3ihPn
z`V`!df}2wCeJMDcf*(r3kEP%zQ}DAX_=Oa_Ck5|I!G}`tkre!g6nr8Df1H9pOTnj8
zF#Q+t$@Vwl!(lScO2IiPI5!1PO~Lso_!)TJFL6DGi{{?X<Jy7i*SKE5^&4Ej#YM+6
zcj2P>^=@1*;@X3Y&iKEKYcH-=T(972!_|&!Kdu9~I&pR3qPg)QT!(SJit9C8zr*!9
zt~YSuSMoG&zryt_u6?*VaQ$!5(JW10<#T&|)7O<(O<(4%yA#L$reD9pI^FB`d+XNv
zT+@AC=k$R`GN(&-d7RUn{|YBD)=Ahkz%rWslVYA)oN98pr#tCX&$LR(!A@*q?Tj-!
z^%Ct%RMz+;>_FV*3#>&pj#}|VeFNK~aI9@uU*~m6j&hfaL`V)S^BwHO7uYCGhlVJL
z(^mL*2VFQ$M8ys|>4W52_Z^-D4UXg`$Z_5c#p`i|Oed}P*4@EQ+&L15MIqM751Tq_
z>pVWxPG_6I$Mj^C;v}Sl?R(%^D@xgJ1F+xk@Okd2bwhoew{!3Y;l!Pu5}J{{HZa8?
zLP*w6sPcy46ejBI&+}4iStiMJ*7{KwjKdO69Is8}K#4nQ{B+t9Hukw#o9Sd0c6^XS
zq<ECW5`4?!U+Z+ii+&dyCmy!d@vjLJyb$IQTP+Tpg=1SN4xHiDQ#c-%Na}kn4iDRh
zx!_{|J6#MruHV{lOX}Ny)}#HdknjK&VswW)-@bA34livVC++Pf?I!ai?Ik0nZ}sY%
zy!!U8*x2P;y833WzKtvPZygnE<JM6jc5IQL{ZITmqi%!^oOX6s;lX!h_3c<1n{<+0
zY{2rJSAEOXQN#CI9W`u|Rp02QCv9`<yR8mh4c}i)Y)R@ns@Mik+DZjtd#LP*%~N{P
Xt||UePx@CE5uEux>9;n}CF%bFteSi{

literal 0
HcmV?d00001

diff --git a/src/share/zoneinfo/zic.c b/src/share/zoneinfo/zic.c
index 752613d..07e4257 100644
--- a/src/share/zoneinfo/zic.c
+++ b/src/share/zoneinfo/zic.c
@@ -1,15 +1,16 @@
 /*
  *	@(#)zic.c	1.1 zic.c 3/4/87
  */
-
-#include "stdio.h"
-#include "ctype.h"
-#include "sys/types.h"
-#include "sys/stat.h"
-#include "sys/file.h"
-#include "strings.h"
-#include "time.h"
-#include "tzfile.h"
+#include <stdio.h>
+#include <stdlib.h>
+#include <ctype.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <sys/file.h>
+#include <strings.h>
+#include <time.h>
+#include <tzfile.h>
+#include <getopt.h>
 
 #ifndef BUFSIZ
 #define BUFSIZ	1024
@@ -23,50 +24,47 @@
 extern char *	icpyalloc();
 extern char *	imalloc();
 extern char *	irealloc();
-extern char *	optarg;
-extern int	optind;
 extern char *	scheck();
-extern char *	sprintf();
 
-static		addtt();
-static		addtype();
-static		associate();
+static void	addtt();
+static int	addtype();
+static void	associate();
 static int	charcnt;
-static		ciequal();
+static int	ciequal();
 static long	eitol();
 static int	errors;
 static char *	filename;
 static char **	getfields();
 static long	gethms();
-static		infile();
-static		inlink();
-static		inrule();
-static		inzcont();
-static		inzone();
-static		inzsub();
+static void	infile();
+static void	inlink();
+static void	inrule();
+static int	inzcont();
+static int	inzone();
+static int	inzsub();
 static int	linenum;
-static		lowerit();
+static int	lowerit();
 static time_t	max_time;
 static int	max_year;
 static time_t	min_time;
 static int	min_year;
-static		mkdirs();
-static		newabbr();
+static int	mkdirs();
+static void	newabbr();
 static int	noise;
-static		nondunlink();
+static void	nondunlink();
 static long	oadd();
-static		outzone();
+static void	outzone();
 static char *	progname;
 static char *	rfilename;
 static int	rlinenum;
 static time_t	rpytime();
-static		rulesub();
-static		setboundaries();
+static void	rulesub();
+static void	setboundaries();
 static time_t	tadd();
 static int	timecnt;
 static int	tt_signed;
 static int	typecnt;
-static		yearistype();
+static int	yearistype();
 
 /*
 ** Line codes.
@@ -210,66 +208,66 @@ struct lookup {
 static struct lookup *	byword();
 
 static struct lookup	line_codes[] = {
-	"Rule",		LC_RULE,
-	"Zone",		LC_ZONE,
-	"Link",		LC_LINK,
-	NULL,		0
+	{ "Rule",	LC_RULE },
+	{ "Zone",	LC_ZONE },
+	{ "Link",	LC_LINK },
+	{ NULL,		0 }
 };
 
 static struct lookup	mon_names[] = {
-	"January",	TM_JANUARY,
-	"February",	TM_FEBRUARY,
-	"March",	TM_MARCH,
-	"April",	TM_APRIL,
-	"May",		TM_MAY,
-	"June",		TM_JUNE,
-	"July",		TM_JULY,
-	"August",	TM_AUGUST,
-	"September",	TM_SEPTEMBER,
-	"October",	TM_OCTOBER,
-	"November",	TM_NOVEMBER,
-	"December",	TM_DECEMBER,
-	NULL,		0
+	{ "January",	TM_JANUARY },
+	{ "February",	TM_FEBRUARY },
+	{ "March",	TM_MARCH },
+	{ "April",	TM_APRIL },
+	{ "May",	TM_MAY },
+	{ "June",	TM_JUNE },
+	{ "July",	TM_JULY },
+	{ "August",	TM_AUGUST },
+	{ "September",	TM_SEPTEMBER },
+	{ "October",	TM_OCTOBER },
+	{ "November",	TM_NOVEMBER },
+	{ "December",	TM_DECEMBER },
+	{ NULL,		0 }
 };
 
 static struct lookup	wday_names[] = {
-	"Sunday",	TM_SUNDAY,
-	"Monday",	TM_MONDAY,
-	"Tuesday",	TM_TUESDAY,
-	"Wednesday",	TM_WEDNESDAY,
-	"Thursday",	TM_THURSDAY,
-	"Friday",	TM_FRIDAY,
-	"Saturday",	TM_SATURDAY,
-	NULL,		0
+	{ "Sunday",	TM_SUNDAY },
+	{ "Monday",	TM_MONDAY },
+	{ "Tuesday",	TM_TUESDAY },
+	{ "Wednesday",	TM_WEDNESDAY },
+	{ "Thursday",	TM_THURSDAY },
+	{ "Friday",	TM_FRIDAY },
+	{ "Saturday",	TM_SATURDAY },
+	{ NULL,		0 }
 };
 
 static struct lookup	lasts[] = {
-	"last-Sunday",		TM_SUNDAY,
-	"last-Monday",		TM_MONDAY,
-	"last-Tuesday",		TM_TUESDAY,
-	"last-Wednesday",	TM_WEDNESDAY,
-	"last-Thursday",	TM_THURSDAY,
-	"last-Friday",		TM_FRIDAY,
-	"last-Saturday",	TM_SATURDAY,
-	NULL,			0
+	{ "last-Sunday",	TM_SUNDAY },
+	{ "last-Monday",	TM_MONDAY },
+	{ "last-Tuesday",	TM_TUESDAY },
+	{ "last-Wednesday",	TM_WEDNESDAY },
+	{ "last-Thursday",	TM_THURSDAY },
+	{ "last-Friday",	TM_FRIDAY },
+	{ "last-Saturday",	TM_SATURDAY },
+	{ NULL,			0 }
 };
 
 static struct lookup	begin_years[] = {
-	"minimum",		YR_MINIMUM,
-	"maximum",		YR_MAXIMUM,
-	NULL,			0
+	{ "minimum",		YR_MINIMUM },
+	{ "maximum",		YR_MAXIMUM },
+	{ NULL,			0 }
 };
 
 static struct lookup	end_years[] = {
-	"minimum",		YR_MINIMUM,
-	"maximum",		YR_MAXIMUM,
-	"only",			YR_ONLY,
-	NULL,			0
+	{ "minimum",		YR_MINIMUM },
+	{ "maximum",		YR_MAXIMUM },
+	{ "only",		YR_ONLY },
+	{ NULL,			0 }
 };
 
 static int	len_months[2][MONS_PER_YEAR] = {
-	31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31,
-	31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31
+	{ 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 },
+	{ 31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 }
 };
 
 static int	len_years[2] = {
@@ -306,7 +304,7 @@ char *	ptr;
 ** Error handling.
 */
 
-static
+static void
 eats(name, num, rname, rnum)
 char *	name;
 char *	rname;
@@ -317,14 +315,14 @@ char *	rname;
 	rlinenum = rnum;
 }
 
-static
+static void
 eat(name, num)
 char *	name;
 {
 	eats(name, num, (char *) NULL, -1);
 }
 
-static
+static void
 error(string)
 char *	string;
 {
@@ -342,7 +340,7 @@ char *	string;
 	++errors;
 }
 
-static
+static void
 usage()
 {
 	(void) fprintf(stderr,
@@ -354,6 +352,7 @@ usage()
 static char *	lcltime = NULL;
 static char *	directory = NULL;
 
+int
 main(argc, argv)
 int	argc;
 char *	argv[];
@@ -445,7 +444,7 @@ char *	argv[];
 	exit((errors == 0) ? 0 : 1);
 }
 
-static
+static void
 setboundaries()
 {
 	register time_t 	bit;
@@ -471,7 +470,7 @@ setboundaries()
 ** We get to be careful here since there's a fair chance of root running us.
 */
 
-static
+static void
 nondunlink(name)
 char *	name;
 {
@@ -492,7 +491,7 @@ char *	name;
 ** Sort by rule name.
 */
 
-static
+static int
 rcomp(cp1, cp2)
 char *	cp1;
 char *	cp2;
@@ -501,7 +500,7 @@ char *	cp2;
 		((struct rule *) cp2)->r_name);
 }
 
-static
+static void
 associate()
 {
 	register struct zone *	zp;
@@ -549,7 +548,7 @@ associate()
 		exit(1);
 }
 
-static
+static void
 infile(name)
 char *	name;
 {
@@ -674,7 +673,7 @@ char *	errstring;
 		eitol(SECS_PER_MIN) + eitol(ss));
 }
 
-static
+static void
 inrule(fields, nfields)
 register char **	fields;
 {
@@ -700,7 +699,7 @@ register char **	fields;
 	rules[nrules++] = r;
 }
 
-static
+static int
 inzone(fields, nfields)
 register char **	fields;
 {
@@ -732,7 +731,7 @@ register char **	fields;
 	return inzsub(fields, nfields, FALSE);
 }
 
-static
+static int
 inzcont(fields, nfields)
 register char **	fields;
 {
@@ -743,7 +742,7 @@ register char **	fields;
 	return inzsub(fields, nfields, TRUE);
 }
 
-static
+static int
 inzsub(fields, nfields, iscont)
 register char **	fields;
 {
@@ -813,7 +812,7 @@ error("Zone continuation line end time is not after end time of previous line");
 	return hasuntil;
 }
 
-static
+static void
 inlink(fields, nfields)
 register char **	fields;
 {
@@ -840,7 +839,7 @@ register char **	fields;
 	links[nlinks++] = l;
 }
 
-static
+static void
 rulesub(rp, loyearp, hiyearp, typep, monthp, dayp, timep)
 register struct rule *	rp;
 char *			loyearp;
@@ -981,7 +980,7 @@ char *			timep;
 	}
 }
 
-static
+static void
 puttzcode(val, fp)
 long	val;
 FILE *	fp;
@@ -995,7 +994,7 @@ FILE *	fp;
 	}
 }
 
-static
+static void
 writezone(name)
 char *	name;
 {
@@ -1042,7 +1041,7 @@ char *	name;
 	}
 }
 
-static
+static void
 outzone(zpfirst, zonecount)
 struct zone *	zpfirst;
 {
@@ -1187,7 +1186,7 @@ addtt(starttime, addtype(startoff, startbuf, startisdst));
 	writezone(zpfirst->z_name);
 }
 
-static
+static void
 addtt(starttime, type)
 time_t	starttime;
 {
@@ -1202,7 +1201,7 @@ time_t	starttime;
 	++timecnt;
 }
 
-static
+static int
 addtype(gmtoff, abbr, isdst)
 long	gmtoff;
 char *	abbr;
@@ -1215,7 +1214,7 @@ char *	abbr;
 	*/
 	for (i = 0; i < typecnt; ++i) {
 		if (gmtoff == gmtoffs[i] && isdst == isdsts[i] &&
-			strcmp(abbr, &chars[abbrinds[i]]) == 0)
+			strcmp(abbr, &chars[(int)abbrinds[i]]) == 0)
 				return i;
 	}
 	/*
@@ -1239,7 +1238,7 @@ char *	abbr;
 	return i;
 }
 
-static
+static int
 yearistype(year, type)
 char *	type;
 {
@@ -1265,13 +1264,13 @@ char *	type;
 		exit(1);
 }
 
-static
+static int
 lowerit(a)
 {
 	return (isascii(a) && isupper(a)) ? tolower(a) : a;
 }
 
-static
+static int
 ciequal(ap, bp)		/* case-insensitive equality */
 register char *	ap;
 register char *	bp;
@@ -1282,7 +1281,7 @@ register char *	bp;
 	return FALSE;
 }
 
-static
+static int
 isabbr(abbr, word)
 register char *	abbr;
 register char *	word;
@@ -1318,10 +1317,11 @@ register struct lookup *	table;
 	*/
 	foundlp = NULL;
 	for (lp = table; lp->l_word != NULL; ++lp)
-		if (isabbr(word, lp->l_word))
+		if (isabbr(word, lp->l_word)) {
 			if (foundlp == NULL)
 				foundlp = lp;
 			else	return NULL;	/* multiple inexact matches */
+                }
 	return foundlp;
 }
 
@@ -1368,7 +1368,8 @@ long	t2;
 	register long	t;
 
 	t = t1 + t2;
-	if (t2 > 0 && t <= t1 || t2 < 0 && t >= t1) {
+	if ((t2 > 0 && t <= t1) ||
+            (t2 < 0 && t >= t1)) {
 		error("time overflow");
 		exit(1);
 	}
@@ -1387,7 +1388,8 @@ long	t2;
 	if (t1 == min_time && t2 < 0)
 		return min_time;
 	t = t1 + t2;
-	if (t2 > 0 && t <= t1 || t2 < 0 && t >= t1) {
+	if ((t2 > 0 && t <= t1) ||
+            (t2 < 0 && t >= t1)) {
 		error("time overflow");
 		exit(1);
 	}
@@ -1490,7 +1492,7 @@ register int		wantedy;
 	return tadd(t, rp->r_tod);
 }
 
-static
+static void
 newabbr(string)
 char *	string;
 {
@@ -1505,7 +1507,7 @@ char *	string;
 	charcnt += eitol(i);
 }
 
-static
+static int
 mkdirs(name)
 char *	name;
 {
@@ -1530,7 +1532,9 @@ eitol(i)
 	long	l;
 
 	l = i;
-	if (i < 0 && l >= 0 || i == 0 && l != 0 || i > 0 && l <= 0) {
+	if ((i < 0 && l >= 0) ||
+            (i == 0 && l != 0) ||
+            (i > 0 && l <= 0)) {
 		(void) fprintf(stderr, "%s: %d did not sign extend correctly\n",
 			progname, i);
 		exit(1);