From 7562e8e4106b7be9d0b072542f365f29741b266d Mon Sep 17 00:00:00 2001 From: vak Date: Tue, 20 Oct 2015 00:42:29 -0700 Subject: [PATCH] Install zoneinfo files. --- etc/.gitignore | 1 + include/tzfile.h | 3 ++ rootfs.manifest | 91 ++++++++++++++++++++++++++++++++++ share/.gitignore | 9 ++-- src/share/Makefile | 2 +- src/share/zoneinfo/.gitignore | 3 ++ src/share/zoneinfo/Makefile | 12 +++-- src/share/zoneinfo/zdump | Bin 15404 -> 0 bytes src/share/zoneinfo/zdump.c | 7 +-- src/share/zoneinfo/zic | Bin 30660 -> 0 bytes src/share/zoneinfo/zic.c | 11 ++-- 11 files changed, 121 insertions(+), 18 deletions(-) create mode 100644 src/share/zoneinfo/.gitignore delete mode 100755 src/share/zoneinfo/zdump delete mode 100755 src/share/zoneinfo/zic diff --git a/etc/.gitignore b/etc/.gitignore index c602e3a..0afe2a7 100644 --- a/etc/.gitignore +++ b/etc/.gitignore @@ -1,3 +1,4 @@ +localtime phones remote termcap diff --git a/include/tzfile.h b/include/tzfile.h index 3331931..7ef8b3b 100644 --- a/include/tzfile.h +++ b/include/tzfile.h @@ -5,6 +5,9 @@ /* ** Information about time zone files. */ + /* Time zone object file directory */ +#define TZDIR "/usr/share/zoneinfo" +#define TZDEFAULT "/etc/localtime" /* ** Each file begins with. . . diff --git a/rootfs.manifest b/rootfs.manifest index a0d78b1..7939249 100644 --- a/rootfs.manifest +++ b/rootfs.manifest @@ -422,6 +422,7 @@ file /etc/shadow file /etc/shells file /etc/termcap mode 0444 +file /etc/localtime file /etc/ttys # @@ -956,6 +957,11 @@ dir /share dir /share/calendar dir /share/dict dir /share/misc +dir /share/zoneinfo +dir /share/zoneinfo/Australia +dir /share/zoneinfo/Canada +dir /share/zoneinfo/SystemV +dir /share/zoneinfo/US file /share/calendar/calendar.birthday file /share/calendar/calendar.christian file /share/calendar/calendar.computer @@ -968,6 +974,91 @@ file /share/emg.keys file /share/re.help file /share/dict/words file /share/misc/more.help +file /share/zoneinfo/Australia/North +file /share/zoneinfo/Australia/NSW +file /share/zoneinfo/Australia/Queensland +file /share/zoneinfo/Australia/South +file /share/zoneinfo/Australia/Tasmania +file /share/zoneinfo/Australia/Victoria +file /share/zoneinfo/Australia/West +file /share/zoneinfo/Canada/Atlantic +file /share/zoneinfo/Canada/Central +file /share/zoneinfo/Canada/Eastern +file /share/zoneinfo/Canada/Mountain +file /share/zoneinfo/Canada/Newfoundland +file /share/zoneinfo/Canada/Pacific +file /share/zoneinfo/Canada/Yukon +file /share/zoneinfo/CET +file /share/zoneinfo/CST6CDT +file /share/zoneinfo/EET +file /share/zoneinfo/EST +file /share/zoneinfo/EST5EDT +file /share/zoneinfo/GB-Eire +file /share/zoneinfo/GMT-12 +file /share/zoneinfo/GMT-11 +file /share/zoneinfo/GMT-10 +file /share/zoneinfo/GMT-9 +file /share/zoneinfo/GMT-8 +file /share/zoneinfo/GMT-7 +file /share/zoneinfo/GMT-6 +file /share/zoneinfo/GMT-5 +file /share/zoneinfo/GMT-4 +file /share/zoneinfo/GMT-3 +file /share/zoneinfo/GMT-2 +file /share/zoneinfo/GMT-1 +file /share/zoneinfo/GMT +file /share/zoneinfo/GMT+1 +file /share/zoneinfo/GMT+2 +file /share/zoneinfo/GMT+3 +file /share/zoneinfo/GMT+4 +file /share/zoneinfo/GMT+5 +file /share/zoneinfo/GMT+6 +file /share/zoneinfo/GMT+7 +file /share/zoneinfo/GMT+8 +file /share/zoneinfo/GMT+9 +file /share/zoneinfo/GMT+10 +file /share/zoneinfo/GMT+11 +file /share/zoneinfo/GMT+12 +file /share/zoneinfo/GMT+13 +file /share/zoneinfo/Greenwich +file /share/zoneinfo/HST +file /share/zoneinfo/Iceland +file /share/zoneinfo/Japan +file /share/zoneinfo/MET +file /share/zoneinfo/MST +file /share/zoneinfo/MST7MDT +file /share/zoneinfo/NZ +file /share/zoneinfo/Poland +file /share/zoneinfo/PST8PDT +file /share/zoneinfo/Singapore +file /share/zoneinfo/SystemV/AST4 +file /share/zoneinfo/SystemV/AST4ADT +file /share/zoneinfo/SystemV/CST6 +file /share/zoneinfo/SystemV/CST6CDT +file /share/zoneinfo/SystemV/EST5 +file /share/zoneinfo/SystemV/EST5EDT +file /share/zoneinfo/SystemV/HST10 +file /share/zoneinfo/SystemV/MST7 +file /share/zoneinfo/SystemV/MST7MDT +file /share/zoneinfo/SystemV/PST8 +file /share/zoneinfo/SystemV/PST8PDT +file /share/zoneinfo/SystemV/YST9 +file /share/zoneinfo/SystemV/YST9YDT +file /share/zoneinfo/Turkey +file /share/zoneinfo/UCT +file /share/zoneinfo/Universal +file /share/zoneinfo/US/Arizona +file /share/zoneinfo/US/Central +file /share/zoneinfo/US/Eastern +file /share/zoneinfo/US/East-Indiana +file /share/zoneinfo/US/Hawaii +file /share/zoneinfo/US/Mountain +file /share/zoneinfo/US/Pacific +file /share/zoneinfo/US/Pacific-New +file /share/zoneinfo/US/Yukon +file /share/zoneinfo/UTC +file /share/zoneinfo/WET +file /share/zoneinfo/W-SU # # Files: /share/examples/asm diff --git a/share/.gitignore b/share/.gitignore index ea8f7a6..6ecd98d 100644 --- a/share/.gitignore +++ b/share/.gitignore @@ -1,5 +1,6 @@ -re.help -misc -unixbench -emg.keys calendar +emg.keys +misc +re.help +unixbench +zoneinfo diff --git a/src/share/Makefile b/src/share/Makefile index 34ce823..ff51438 100644 --- a/src/share/Makefile +++ b/src/share/Makefile @@ -6,7 +6,7 @@ TOPSRC = $(shell cd ../..; pwd) include $(TOPSRC)/target.mk -SUBDIR = misc +SUBDIR = misc zoneinfo all: ${SUBDIR} diff --git a/src/share/zoneinfo/.gitignore b/src/share/zoneinfo/.gitignore new file mode 100644 index 0000000..0c5eb45 --- /dev/null +++ b/src/share/zoneinfo/.gitignore @@ -0,0 +1,3 @@ +tzfile.h +zdump +zic diff --git a/src/share/zoneinfo/Makefile b/src/share/zoneinfo/Makefile index e969985..980debc 100644 --- a/src/share/zoneinfo/Makefile +++ b/src/share/zoneinfo/Makefile @@ -19,7 +19,6 @@ LOCALTIME= US/Pacific # (and add solar87 to the DATA= line below). CFLAGS= -O -SEPFLAG=-i LINTFLAGS= -phbaxc CC= cc -g -Wall -Werror @@ -39,7 +38,7 @@ MANSRC= $(ZICMANSRC) $(ZDUMAN) SHARDIR= ${DESTDIR}/share/zoneinfo MANDIR= ${DESTDIR}/man/cat8 -all: zdump zic ${ZICMAN} ${ZDUMAN} +all: tzfile.h zdump zic ${ZICMAN} ${ZDUMAN} install: zic $(DATA) $(MAN) (umask 22; ./zic -d ${SHARDIR} $(DATA)) @@ -55,14 +54,17 @@ zic.0: $(ZICMANSRC) nroff -man $(ZICMANSRC) > $(ZICMAN) zdump: $(TZDOBJS) - $(CC) $(CFLAGS) $(LFLAGS) $(SEPFLAG) $(TZDOBJS) -o $@ + $(CC) $(CFLAGS) $(LFLAGS) $(TZDOBJS) -o $@ zic: $(TZCOBJS) - $(CC) $(CFLAGS) $(LFLAGS) $(SEPFLAG) $(TZCOBJS) -o $@ + $(CC) $(CFLAGS) $(LFLAGS) $(TZCOBJS) -o $@ + +tzfile.h: ${DESTDIR}/include/tzfile.h + ln -s $< $@ lint: $(TZCSRCS) $(TZDSRCS) lint $(LINTFLAGS) $(CFLAGS) $(TZCSRCS) lint $(LINTFLAGS) $(CFLAGS) $(TZDSRCS) clean: - rm -f *.o zdump zic $(ZICMAN) $(ZDUMAN) + rm -f *.o zdump zic $(ZICMAN) $(ZDUMAN) tzfile.h diff --git a/src/share/zoneinfo/zdump b/src/share/zoneinfo/zdump deleted file mode 100755 index 559eea2aa95ad3be8cbae4afb6bb159055589469..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 15404 zcmeHOe{fXCecuBKgs?f$kd(v$o(*!9A4rJU8Do&cfzE!150EWk2vmNY?oQI#l1{yQ z!oajaj<^nQj!V=T$Dy5eLeqNcahnWjZAv|Zd{huL8SE;g^|+14#vYqK8RNn&3zM1e75$)8V1H)(u?r51QBK5VIJk`B`ZvyU!IjY$( z%=lh&TGnfC)glZA&Gi+I3~|}CI6;3gG>o*_*Os1QdF{1*-m&+6CE;RMp+ec4_K)_A z&UjaEJOv@Iy|N{ay`?H>#Ekn?y3W67+Ds*SI+TFd-fc@AdkxASadDbq8x4lh*YjAS zCuSsi+LIE`oR8hh9DBXW2(i~jv3i*v z23i6|Vw&TZs8T#&nH1(apb4Wp;aNbl=zOLiH(X6lCaTysL3=@;ko7GyUWMn|$} z*WBa%%cjZ0k0>SEL9EK9Uuv`yEkP z9s)iJg__lvcW~&_V&pvVF4SFXK!Z6SbQ3ZYRAi<-#(O#PjZ!ZJzV-=?3&7Km>2_UT zI#t(|Xse6u>xuz0aqj6yZ0mt@-`n1B%h1i|whU~yVvKnevZ$<-`HLV9<0BhFym87r3jQFP>Mh) z0;LF)B2bDzDFUSklp;`yKq&&H2>fqFV4H5e9oQatD6lQi(yTxJZYTbW)vYT5tDtAg zU%-FqdKNf18mylP=c@Dbgb1AEc|d*s(h~o&^m@BhjhzDo;Ln|?z4 z$Y;G@K%1303Sm8W@&t8$2A#9z@ALctX>;_B6~Q&v{JGEIFeYgID)@z8>egTMLvT~> z^H+lPm-Xyg`_G^fioU3?8QC+>Dt{iT0qcxDFkBHRoa=iH>UvhH_;aH;3J68dqRT@t z!T4;-uDfD?9R_lH%j~T<`3zZSHfJvT56(e{Te4+W>L>KG{|q+^_4%;%UwZE5?_?^gRMVr zA4WH7Rv5))aBvF*0{-K32PW(Ks=`*`((d;5TK}?x>;X0k_A}^QKXpOV|B0MWBkR5q z{nVtUH~26M{(+ZZrGDah9?rq*+*70ID{TEIoWC8;hjZogQEj$9utzaq*>LB1_-9|0 z<3GDOQ}7@B5^P|EgHRpfK}h|1c6}KVLoh3z=OV+LJu6LrV2_|dADHy{Gec zPFDDj=bj@u@05P(4WP_%iQw;ribntOAN(U=Xx^D2c;pymH-8Lkj1vaIe(ZKQLp;>~ zfX|V#o5A8lee16v5GtJUFY5;})45}?9mX)fH09i_j&p2K&izQb<2v{E61mPj^$&od zd8hS(lU&cjoEKjE6c_7(dU_MenJWs8gJ)ouEQ!L_Mf+JWLWLJY10VbR-|oQj;jl7@ z9A-K5HXN11Iq<`4%D_Qo-~?HE?%4D|A3=+rJ;{l%`SgbhKMt>bPOjg>_k0Zhtk?AH zlGB(!J`1&~ix1HS@nVJFk+?i3#e}{#IO@;Lh2{FZ{`hH{-4*!#Kx^RPfYCavXTP#3 zyXXo%eo=N_{;*WLOV54^k3A=+K5vg=<-UMsVLvU`aQT{IpjKXrGRez)c%7h^C8Fle{j{ia@CN-a^5J#H(QhThAHvSIpTloh=;PD zfy+CbewVN**U$}Q2c{Ipu#)U^DEK~*@7sr(^?`S*0@lmA^?`2n+1WeebTZfA^ru@t zu`8e+#OtnF&;5~YzX@&KI%^-6^(jbdvPa!|$$pJI3JuG~VcmM&j!ntA1AfUqPF{4Q zre|;dUFrKBr~2;^<^mYIi1|UppMV7WT%Jv9;Qp(_{RZ{2=^Aj(Ih-zVUcgI8*qv+} zI9;_X@Nny}e_5k&#)r?7=B5yb_r7j@6wWq$1Kx(RUqht6BTaCG)6KYG$Q-=VwcE$hwNr z2J7F_Gd~XuL0y>hIlx`e2w6YIThE-&HGjXvr#I#rZ}(;LMIHUztfc&B(SE4{o!M9E zgEdUePr<0UAQZi(`(6)Q*K8ij>((oLs^l|OJYGaUWL=Zv+ALJRDa*HHc~O?OEZ>pkyRv*w zmgBPgg)Dz5%L!Rd%JM^5{z{hDWXaE!LiH?JmdSFCEGuMLDa)H=xj>dxviu!cE>fcE1B=r`lCQ?^O-Ak$*(>k_})FM)= zNi8Q;LuxgtrKC2HT14tWQkA44qy(v6QWMue9U%2Csl%k+1Qoq|k7y9p>ASVQbfhD$ zCDK}TTHB?q+@rN>`;$HK9$fxuwY9aCQYaef`8`vMbaf@85i_oJ$GelMeU+kRXG3*b zq@;+M=#EoSlbY4(I@p6%Gnv%7l06-j&ZS7YGm?teQBGb}N-?RvQTCARjrV902UDqJ zN{e(YM>*zL{~Le^B`LR{5%Knp-glCvL>2;onADgv(8ib*ZXrRJ~f&>r{QO zs+&~3Q`Iq5_o#ZWs=uk~!>WE#)kjtRjH;hi^^mGZRDE96ud4c@s>fCRp{mQ&J^BJw zFIM$$BQ_-)r3jQFP>Mh)0;LF)B2bDzDFUSklp;`yKq&&H2>gFXVBu~0ZhqHw;d+B# zg^xrZHKLu58XbK&FA)!?D(K(1}1wcRc9Dciqi)`XB~Hs>$P4dnD0C{toaX=_n79 z2zL{j$pq<6&{28(MAQou-l3) zxJGLLcQe)T@6bd{-k(}D}P=^JNa98VQqBBb9&roM~G zqy8#nCSvLrW9qM0`tPBg`YxvY|3tr6=}#(s7rXlIIwofS#hCr`kd_seitOLTA#CXO8tdYMk1zuF^-X`(x*YwhP$3_QP^D{w7sBc{#OF~eN|E$ zqzFhn9sf-VyYbkjusgop3cLPxDD2KZuLk_c?tJW5*nNKbft^2R0N?iDzw}_BlOD_$h{JOHukc{M2QT(uenFyGzuJSp?7??<@H!8^ z&x5ym@OBS2Jh;PylODX+gCF-`%Y*;Kga6cnzvsb!O*-MzKZ-$d6@O$ux&@DXjKJClzI?hv?}6WDq5bi~u9NXSp!->e6vi!KuC zBi~4<-ItMYKl#a0AMGIBPkkdHHv~8G%J_t>Mv?7bXK~tcezFTM0bPe?zvfW$L;PE4c9F0I_2JQYE$U$24#(HAZzaboQ #include #include -#include #include #include +#include "tzfile.h" #ifndef TRUE #define TRUE 1 @@ -15,10 +15,12 @@ #endif extern char **environ; +extern char *tzname[2]; extern char *imalloc(int); +extern void tzset(void); -static int longest; +static int longest; static void show(zone, t, v) @@ -26,7 +28,6 @@ char * zone; time_t t; { struct tm * tmp; - extern struct tm * localtime(); (void) printf("%-*s ", longest, zone); if (v) diff --git a/src/share/zoneinfo/zic b/src/share/zoneinfo/zic deleted file mode 100755 index cb977bd6845bc034ec32fe0a7863f139d397e94a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 30660 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 diff --git a/src/share/zoneinfo/zic.c b/src/share/zoneinfo/zic.c index 07e4257..3c8c8b0 100644 --- a/src/share/zoneinfo/zic.c +++ b/src/share/zoneinfo/zic.c @@ -3,14 +3,15 @@ */ #include #include +#include #include #include #include #include -#include +#include #include -#include #include +#include "tzfile.h" #ifndef BUFSIZ #define BUFSIZ 1024 @@ -1049,11 +1050,11 @@ struct zone * zpfirst; register struct rule * rp; register int i, j; register int usestart, useuntil; - register time_t starttime, untiltime; + register time_t starttime = 0, untiltime = 0; register long gmtoff; register long stdoff; register int year; - register long startoff; + register long startoff = 0; register int startisdst; register int type; char startbuf[BUFSIZ]; @@ -1101,7 +1102,7 @@ struct zone * zpfirst; } for ( ; ; ) { register int k; - register time_t jtime, ktime; + register time_t jtime, ktime = 0; register long offset; char buf[BUFSIZ];