1
0
Fork 0
mirror of git://git.code.sf.net/p/cdesktopenv/code synced 2025-03-09 15:50:02 +00:00

Merge pull request #8 from JohnoKing/fix-freebsd-date

Backport the ksh2020 fix for timezone name determination

Partial fix for #6.
This commit is contained in:
Martijn Dekker 2020-06-14 00:07:51 +01:00 committed by GitHub
commit 76f7d15a93
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 8 deletions

4
NEWS
View file

@ -4,6 +4,10 @@ For full details, see the git log at:
Any uppercase BUG_* names are modernish shell bug IDs.
2020-06-13:
- Fixed a timezone name determination bug on FreeBSD that caused the
output from `LC_ALL=C printf '%T' now` to print the wrong time zone name.
2020-06-11:
- Fixed a bug that caused running 'builtin -d' on a special builtin to

View file

@ -247,10 +247,6 @@ tmlocal(void)
else if (e)
environ[0] = e;
}
#endif
#if _dat_tzname
local.standard = strdup(tzname[0]);
local.daylight = strdup(tzname[1]);
#endif
tmlocale();
@ -296,10 +292,8 @@ tmlocal(void)
* POSIX
*/
if (!local.standard)
local.standard = strdup(tzname[0]);
if (!local.daylight)
local.daylight = strdup(tzname[1]);
local.standard = strdup(tzname[0]);
local.daylight = strdup(tzname[1]);
}
else
#endif