Module Name: src
Committed By: christos
Date: Sun Apr 7 14:44:51 UTC 2019
Modified Files:
src/lib/libc/time: localtime.c
Log Message:
Initialize the default timezone a bit more so that tzgetname(3) works.
To generate a diff of this commit:
cvs rdiff -u -r1.117 -r1.118 src/lib/libc/time/localtime.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libc/time/localtime.c
diff -u src/lib/libc/time/localtime.c:1.117 src/lib/libc/time/localtime.c:1.118
--- src/lib/libc/time/localtime.c:1.117 Thu Apr 4 15:27:28 2019
+++ src/lib/libc/time/localtime.c Sun Apr 7 10:44:51 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: localtime.c,v 1.117 2019/04/04 19:27:28 christos Exp $ */
+/* $NetBSD: localtime.c,v 1.118 2019/04/07 14:44:51 christos Exp $ */
/* Convert timestamp from time_t to struct tm. */
@@ -12,7 +12,7 @@
#if 0
static char elsieid[] = "@(#)localtime.c 8.17";
#else
-__RCSID("$NetBSD: localtime.c,v 1.117 2019/04/04 19:27:28 christos Exp $");
+__RCSID("$NetBSD: localtime.c,v 1.118 2019/04/07 14:44:51 christos Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -290,7 +290,6 @@ tzgetname(const timezone_t sp, int isdst
int i;
for (i = 0; i < sp->typecnt; ++i) {
const struct ttinfo *const ttisp = &sp->ttis[sp->types[i]];
-
if (ttisp->tt_isdst == isdst)
return &sp->chars[ttisp->tt_abbrind];
}
@@ -1392,9 +1391,10 @@ zoneinit(struct state *sp, char const *n
*/
sp->leapcnt = 0; /* so, we're off a little */
sp->timecnt = 0;
- sp->typecnt = 0;
+ sp->typecnt = 1;
sp->charcnt = 0;
sp->goback = sp->goahead = false;
+ sp->types[0] = sp->types[1] = 0;
init_ttinfo(&sp->ttis[0], 0, false, 0);
strcpy(sp->chars, gmt);
sp->defaulttype = 0;
