From b39d4ade08776523f31c35d5283ab6aee1c3531f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Duval?= Date: Mon, 22 Nov 2004 17:35:13 +0000 Subject: [PATCH] modified tzset to use the global tzfilename when no TZ env variable is found git-svn-id: file:///srv/svn/repos/haiku/trunk/current@10180 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/kernel/libroot/posix/time/localtime.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/kernel/libroot/posix/time/localtime.c b/src/kernel/libroot/posix/time/localtime.c index b16a24f277..139d553b2e 100644 --- a/src/kernel/libroot/posix/time/localtime.c +++ b/src/kernel/libroot/posix/time/localtime.c @@ -947,15 +947,24 @@ tzsetwall P((void)) settzname(); } + +#include +void _get_tzfilename(char* filename, size_t length); + void tzset P((void)) { register const char * name; + char tzfilename[B_PATH_NAME_LENGTH]; name = getenv("TZ"); if (name == NULL) { - tzsetwall(); - return; + _get_tzfilename(tzfilename, B_PATH_NAME_LENGTH); + if (tzfilename[0] == '\0') { + tzsetwall(); + return; + } + name = tzfilename; } if (lcl_is_set > 0 && strcmp(lcl_TZname, name) == 0)