NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commita330da4

committed

Modernize zic's test for valid timezone abbreviations.

We really need to sync all of our IANA-derived timezone code with upstream,but that's going to be a large patch and I certainly don't care to shovesuch a thing into stable branches immediately before a release. As astopgap, copy just the tzcode2016c logic that checks validity of timezoneabbreviations. This prevents getting multiple "time zone abbreviationdiffers from POSIX standard" bleats with tzdata 2014b and later.

1 parentde371e6 commita330da4Copy full SHA for a330da4

File tree

1 file changed

-20

lines changed

src/timezone
- zic.c

1 file changed

-20

lines changed

`‎src/timezone/zic.c`

Lines changed: 5 additions & 20 deletions

Original file line number	Diff line number	Diff line change
`@@ -2792,30 +2792,15 @@ newabbr(const char *string)`
`2792`	`2792`	`constchar*cp;`
`2793`	`2793`	`char*wp;`
`2794`	`2794`
`2795`		`-/*`
`2796`		`- * Want one to ZIC_MAX_ABBR_LEN_WO_WARN alphabetics optionally`
`2797`		`- * followed by a + or - and a number from 1 to 14.`
`2798`		`- */`
`2799`	`2795`	`cp=string;`
`2800`	`2796`	`wp=NULL;`
`2801`		`-while (isascii((unsignedchar)*cp)&&`
`2802`		`-isalpha((unsignedchar)*cp))`
	`2797`	`+while (isalpha((unsignedchar)cp)\|\| ('0' <=cp&&*cp <='9')`
	`2798`	`+\|\|cp=='-'\|\|cp=='+')`
`2803`	`2799`	`++cp;`
`2804`		`-if (cp-string==0)`
`2805`		`-wp=_("time zone abbreviation lacks alphabetic at start");`
`2806`		`-if (noise&&cp-string>3)`
`2807`		`-wp=_("time zone abbreviation has more than 3 alphabetics");`
	`2800`	`+if (noise&&cp-string<3)`
	`2801`	`+wp=_("time zone abbreviation has fewer than 3 characters");`
`2808`	`2802`	`if (cp-string>ZIC_MAX_ABBR_LEN_WO_WARN)`
`2809`		`-wp=_("time zone abbreviation has too many alphabetics");`
`2810`		`-if (wp==NULL&& (cp=='+'\|\|cp=='-'))`
`2811`		`-{`
`2812`		`-++cp;`
`2813`		`-if (isascii((unsignedchar)*cp)&&`
`2814`		`-isdigit((unsignedchar)*cp))`
`2815`		`-if (*cp++=='1'&&`
`2816`		`-cp >='0'&&cp <='4')`
`2817`		`-++cp;`
`2818`		`-}`
	`2803`	`+wp=_("time zone abbreviation has too many characters");`
`2819`	`2804`	`if (*cp!='\0')`
`2820`	`2805`	`wp=_("time zone abbreviation differs from POSIX standard");`
`2821`	`2806`	`if (wp!=NULL)`

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!

Commita330da4

File tree

1 file changed

1 file changed

`‎src/timezone/zic.c`

0 commit comments