NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commit5968570

committed

Fix bogus logic for zic -P option.

The quick hack I added to zic to dump out currently-in-use timezoneabbreviations turns out to have a nasty bug: within each zone, it wasprinting the last "struct ttinfo" to be *defined*, not necessarily thelast one in use. This was mainly a problem in zones that had changed themeaning of their zone abbreviation (to another GMT offset value) and laterchanged it back.As a result of this error, we'd missed out updating the tznames/ filesfor some jurisdictions that have changed their zone abbreviations sincethe tznames/ files were originally created. I'll address the missing dataupdates in a separate commit.

1 parent1021bd6 commit5968570Copy full SHA for 5968570

File tree

1 file changed

+18

-15

lines changed

src/timezone
- zic.c

1 file changed

+18

-15

lines changed

`‎src/timezone/zic.c`

Lines changed: 18 additions & 15 deletions

Original file line number	Diff line number	Diff line change
`@@ -1766,7 +1766,25 @@ writezone(const char name, const char string)`
`1766`	`1766`	`if (pass==1)`
`1767`	`1767`	`puttzcode((long)ats[i],fp);`
`1768`	`1768`	`else`
	`1769`	`+{`
`1769`	`1770`	`puttzcode64(ats[i],fp);`
	`1771`	`+`
	`1772`	`+/* Print current timezone abbreviations if requested */`
	`1773`	`+if (print_abbrevs&&`
	`1774`	`+(ats[i] >=print_cutoff\|\|i==thistimelim-1))`
	`1775`	`+{`
	`1776`	`+unsignedchartm=typemap[types[i]];`
	`1777`	`+char*thisabbrev=&thischars[indmap[abbrinds[tm]]];`
	`1778`	`+`
	`1779`	`+/* filter out assorted junk entries */`
	`1780`	`+if (strcmp(thisabbrev,GRANDPARENTED)!=0&&`
	`1781`	`+strcmp(thisabbrev,"zzz")!=0)`
	`1782`	`+fprintf(stdout,"%s\t%ld%s\n",`
	`1783`	`+thisabbrev,`
	`1784`	`+gmtoffs[tm],`
	`1785`	`+isdsts[tm] ?"\tD" :"");`
	`1786`	`+}`
	`1787`	`+}`
`1770`	`1788`	`for (i=thistimei;i<thistimelim;++i)`
`1771`	`1789`	`{`
`1772`	`1790`	`unsignedcharuc;`
`@@ -1783,21 +1801,6 @@ writezone(const char name, const char string)`
`1783`	`1801`	`puttzcode(gmtoffs[i],fp);`
`1784`	`1802`	`(void)putc(isdsts[i],fp);`
`1785`	`1803`	`(void)putc((unsignedchar)indmap[abbrinds[i]],fp);`
`1786`		`-`
`1787`		`-/* Print current timezone abbreviations if requested */`
`1788`		`-if (print_abbrevs&&pass==2&&`
`1789`		`-(ats[i] >=print_cutoff\|\|i==typecnt-1))`
`1790`		`-{`
`1791`		`-char*thisabbrev=&thischars[indmap[abbrinds[i]]];`
`1792`		`-`
`1793`		`-/* filter out assorted junk entries */`
`1794`		`-if (strcmp(thisabbrev,GRANDPARENTED)!=0&&`
`1795`		`-strcmp(thisabbrev,"zzz")!=0)`
`1796`		`-fprintf(stdout,"%s\t%ld%s\n",`
`1797`		`-thisabbrev,`
`1798`		`-gmtoffs[i],`
`1799`		`-isdsts[i] ?"\tD" :"");`
`1800`		`-}`
`1801`	`1804`	`}`
`1802`	`1805`	`if (thischarcnt!=0)`
`1803`	`1806`	`(void)fwrite((void*)thischars,`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit5968570

File tree

1 file changed

1 file changed

`‎src/timezone/zic.c`

0 commit comments