diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | file.c | 2 | ||||
| -rw-r--r-- | win32/file.c | 29 |
3 files changed, 35 insertions, 1 deletions
@@ -1,4 +1,7 @@ -Mon Mar 23 17:36:00 2015 Nobuyoshi Nakada <nobu@ruby-lang.org> +Mon Mar 23 21:22:07 2015 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * win32/file.c (rb_readlink): move from file.c for better buffer + allocation and the result encoding. * win32/win32.c (wreadlink, rb_w32_ureadlink): implement readlink(). @@ -2790,6 +2790,7 @@ rb_file_s_readlink(VALUE klass, VALUE path) return rb_readlink(path); } +#ifndef _WIN32 VALUE rb_readlink(VALUE path) { @@ -2818,6 +2819,7 @@ rb_readlink(VALUE path) return v; } +#endif #else #define rb_file_s_readlink rb_f_notimplement #endif diff --git a/win32/file.c b/win32/file.c index 1884f2a9b1..0f5b285ff8 100644 --- a/win32/file.c +++ b/win32/file.c @@ -653,6 +653,35 @@ rb_file_expand_path_internal(VALUE fname, VALUE dname, int abs_mode, int long_na return result; } +ssize_t rb_w32_wreadlink(const WCHAR *path, WCHAR *buf, size_t bufsize); + +VALUE +rb_readlink(VALUE path) +{ + ssize_t len; + WCHAR *wpath, wbuf[MAX_PATH]; + rb_encoding *enc; + UINT cp, path_cp; + + rb_secure(2); + FilePathValue(path); + enc = rb_enc_get(path); + cp = path_cp = code_page(enc); + if (cp == INVALID_CODE_PAGE) { + path = fix_string_encoding(path, enc); + cp = CP_UTF8; + } + wpath = mbstr_to_wstr(cp, RSTRING_PTR(path), RSTRING_LEN(path), NULL); + if (!wpath) rb_memerror(); + len = rb_w32_wreadlink(wpath, wbuf, numberof(wbuf)); + free(wpath); + if (len < 0) rb_sys_fail_path(path); + enc = rb_filesystem_encoding(); + cp = path_cp = code_page(enc); + if (cp == INVALID_CODE_PAGE) cp = CP_UTF8; + return append_wstr(rb_enc_str_new(0, 0, enc), wbuf, len, cp, path_cp, enc); +} + int rb_file_load_ok(const char *path) { |