diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | win32/win32.c | 20 |
2 files changed, 15 insertions, 10 deletions
@@ -1,4 +1,7 @@ -Sun Jun 30 10:58:47 2013 Nobuyoshi Nakada <nobu@ruby-lang.org> +Sun Jun 30 10:58:53 2013 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * win32/win32.c (w32_stati64): extract codepage aware code from + rb_w32_ustati64() and rb_w32_stati64(). * dln.h (DLN_FIND_EXTRA_ARG, DLN_FIND_EXTRA_ARG_DECL): allow extra arguments to dln_find_{exe,file}_r(). diff --git a/win32/win32.c b/win32/win32.c index a6ce3120db..6a69a97092 100644 --- a/win32/win32.c +++ b/win32/win32.c @@ -49,6 +49,8 @@ #include "win32/dir.h" #define isdirsep(x) ((x) == '/' || (x) == '\\') +static int w32_stati64(const char *path, struct stati64 *st, UINT cp); + #undef stat #undef fclose #undef close @@ -4892,24 +4894,24 @@ wstati64(const WCHAR *path, struct stati64 *st) int rb_w32_ustati64(const char *path, struct stati64 *st) { - WCHAR *wpath; - int ret; - - if (!(wpath = utf8_to_wstr(path, NULL))) - return -1; - ret = wstati64(wpath, st); - free(wpath); - return ret; + return w32_stati64(path, st, CP_UTF8); } /* License: Ruby's */ int rb_w32_stati64(const char *path, struct stati64 *st) { + return w32_stati64(path, st, filecp()); +} + +/* License: Ruby's */ +static int +w32_stati64(const char *path, struct stati64 *st, UINT cp) +{ WCHAR *wpath; int ret; - if (!(wpath = filecp_to_wstr(path, NULL))) + if (!(wpath = mbstr_to_wstr(cp, path, -1, NULL))) return -1; ret = wstati64(wpath, st); free(wpath); |