diff options
| author | Nobuyoshi Nakada <[email protected]> | 2024-12-06 16:56:29 +0900 |
|---|---|---|
| committer | Nobuyoshi Nakada <[email protected]> | 2024-12-06 18:59:38 +0900 |
| commit | 1c15f641cc2bb88fa88123a11036ed58fbf9aa6d (patch) | |
| tree | c7ab6a155e8f5c9eacaa46a5d99a24b338ffdefd | |
| parent | 78762b52185aa80ee55c0d49b495aceed863dce2 (diff) | |
[Bug #20929] Win32: Encode timezone name in UTF-8
Notes
Notes:
Merged: https://github.com/ruby/ruby/pull/12269
| -rw-r--r-- | test/ruby/test_time.rb | 4 | ||||
| -rw-r--r-- | time.c | 20 | ||||
| -rw-r--r-- | win32/Makefile.sub | 1 |
3 files changed, 20 insertions, 5 deletions
diff --git a/test/ruby/test_time.rb b/test/ruby/test_time.rb index d4c91e1035..98e4c333a5 100644 --- a/test/ruby/test_time.rb +++ b/test/ruby/test_time.rb @@ -717,13 +717,15 @@ class TestTime < Test::Unit::TestCase assert_equal("2000-01-01 09:12:34 +091234", t2000.localtime(9*3600+12*60+34).inspect) end + FIXED_ZONE_ENCODING = (Encoding::UTF_8 if /mswin|mingw/.match?(RUBY_PLATFORM)) + def assert_zone_encoding(time) zone = time.zone assert_predicate(zone, :valid_encoding?) if zone.ascii_only? assert_equal(Encoding::US_ASCII, zone.encoding) else - enc = Encoding.find('locale') + enc = FIXED_ZONE_ENCODING || Encoding.find('locale') assert_equal(enc, zone.encoding) end end @@ -31,6 +31,10 @@ # include <sys/time.h> #endif +#if defined(HAVE_LOCALE_H) +# include <locale.h> +#endif + #include "id.h" #include "internal.h" #include "internal/array.h" @@ -950,7 +954,11 @@ zone_str(const char *zone) str = rb_usascii_str_new(zone, len); } else { +#if defined(_WIN32) + str = rb_utf8_str_new(zone, len); +#else str = rb_enc_str_new(zone, len, rb_locale_encoding()); +#endif } return rb_fstring(str); } @@ -1649,11 +1657,15 @@ localtime_with_gmtoff_zone(const time_t *t, struct tm *result, long *gmtoff, VAL if (zone) { #if defined(HAVE_TM_ZONE) *zone = zone_str(tm.tm_zone); +#elif defined(_WIN32) + { + char buf[64]; + _locale_t utf8_locale = _create_locale(LC_TIME, ".65001"); + size_t n = _strftime_l(buf, numberof(buf), "%Z", &tm, utf8_locale); + _free_locale(utf8_locale); + *zone = zone_str((ssize_t)n < 0 ? NULL : buf); + } #elif defined(HAVE_TZNAME) && defined(HAVE_DAYLIGHT) -# if defined(RUBY_MSVCRT_VERSION) && RUBY_MSVCRT_VERSION >= 140 -# define tzname _tzname -# define daylight _daylight -# endif /* this needs tzset or localtime, instead of localtime_r */ *zone = zone_str(tzname[daylight && tm.tm_isdst]); #else diff --git a/win32/Makefile.sub b/win32/Makefile.sub index 591278ae22..46b50e9df0 100644 --- a/win32/Makefile.sub +++ b/win32/Makefile.sub @@ -779,6 +779,7 @@ $(CONFIG_H): $(MKFILES) $(srcdir)/win32/Makefile.sub $(win_srcdir)/Makefile.sub #define HAVE_STRUCT_TIMEVAL 1 !if $(MSC_VER) >= 1900 #define HAVE_STRUCT_TIMESPEC +#define HAVE_LOCALE_H 1 !endif !if $(MSC_VER) >= 1600 #define HAVE_INTTYPES_H 1 |