diff options
| author | Yukihiro "Matz" Matsumoto <[email protected]> | 2019-07-29 18:43:16 +0900 |
|---|---|---|
| committer | GitHub <[email protected]> | 2019-07-29 18:43:16 +0900 |
| commit | a8001d693af684cafcc2b0eefc51f0847635a577 (patch) | |
| tree | e71cbb6202b8c791ee42679dbb4d081e836767dd | |
| parent | ff43b2b97c77812abbcbfe14da4582c6c209be9b (diff) | |
| parent | effae4ae55772bd464d5010353e88236ce1ee494 (diff) | |
| download | mruby-a8001d693af684cafcc2b0eefc51f0847635a577.tar.gz mruby-a8001d693af684cafcc2b0eefc51f0847635a577.zip | |
Merge pull request #4604 from kou/time-to-s-utf8
Fix Time#to_s encoding on Windows
| -rw-r--r-- | mrbgems/mruby-time/src/time.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/mrbgems/mruby-time/src/time.c b/mrbgems/mruby-time/src/time.c index 18010476b..e3b5d3fe7 100644 --- a/mrbgems/mruby-time/src/time.c +++ b/mrbgems/mruby-time/src/time.c @@ -19,6 +19,8 @@ #include <string.h> #endif +#include <stdlib.h> + #define NDIV(x,y) (-(-((x)+1)/(y))-1) #define TO_S_FMT "%Y-%m-%d %H:%M:%S " @@ -931,7 +933,13 @@ mrb_time_to_s(mrb_state *mrb, mrb_value self) struct mrb_time *tm = time_get_ptr(mrb, self); const char *fmt = tm->timezone == MRB_TIMEZONE_UTC ? TO_S_FMT "UTC" : TO_S_FMT "%z"; size_t len = strftime(buf, sizeof(buf), fmt, &tm->datetime); - return mrb_str_new(mrb, buf, len); + char *utf8; + mrb_value mrb_string; + buf[len] = '\0'; + utf8 = mrb_utf8_from_locale(buf, (int)len); + mrb_string = mrb_str_new_cstr(mrb, utf8); + mrb_utf8_free(utf8); + return mrb_string; } void |