D52680.id162610.diff
No OneTemporary
Actions

Size

680 B

Referenced Files

None

Subscribers

None

D52680.id162610.diff
View Options

	diff --git a/contrib/tzcode/localtime.c b/contrib/tzcode/localtime.c
	--- a/contrib/tzcode/localtime.c
	+++ b/contrib/tzcode/localtime.c
	@@ -1649,9 +1649,13 @@
	lclptr = sp = malloc(sizeof *lclptr);
	# endif
	if (sp) {
	- if (zoneinit(sp, name, TZLOAD_FROMENV \| TZLOAD_TZSTRING) != 0) {
	+ int err = zoneinit(sp, name, TZLOAD_FROMENV \| TZLOAD_TZSTRING);
	+ if (err != 0) {
	zoneinit(sp, "", 0);
	- strcpy(sp->chars, UNSPEC);
	+ /* Abbreviate with "-00" if there was an error.
	+ Do not treat a missing TZDEFAULT file as an error. */
	+ if (name \|\| err != ENOENT)
	+ strcpy(sp->chars, UNSPEC);
	}
	if (0 < lcl)
	strcpy(lcl_TZname, name);