* localtime.cc (tzsetwall): Use wildabbr if generated timezone name

length < 3.
This commit is contained in:
Corinna Vinschen 2002-05-07 13:18:44 +00:00
parent 3769952b4d
commit 795b46cf8f
2 changed files with 12 additions and 7 deletions

View File

@ -1,3 +1,8 @@
2002-04-28 Norbert Schulze <norbert.schulze@web.de>
* localtime.cc (tzsetwall): Use wildabbr if generated timezone name
length < 3.
2002-05-05 Pierre Humblet <pierre.humblet@ieee.org>
* spawn.cc (spawn_guts): Move call to set_process_privilege()

View File

@ -1396,10 +1396,10 @@ tzsetwall P((void))
dst = cp = buf;
for (src = tz.StandardName; *src; src++)
if (is_upper(*src)) *dst++ = *src;
if (cp == dst)
if ((dst - cp) < 3)
{
/* In Asian Windows, tz.StandardName may not contain
the timezone name. */
/* In non-english Windows, converted tz.StandardName
may not contain a valid standard timezone name. */
strcpy(cp, wildabbr);
cp += strlen(wildabbr);
}
@ -1414,11 +1414,11 @@ tzsetwall P((void))
dst = cp;
for (src = tz.DaylightName; *src; src++)
if (is_upper(*src)) *dst++ = *src;
if (cp == dst)
if ((dst - cp) < 3)
{
/* In Asian Windows, tz.StandardName may not contain
the daylight name. */
strcpy(buf, wildabbr);
/* In non-english Windows, converted tz.DaylightName
may not contain a valid daylight timezone name. */
strcpy(cp, wildabbr);
cp += strlen(wildabbr);
}
else