diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-01-29 08:41:10 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-01-29 08:41:10 +0000 |
| commit | 8fc991162a12670301b38174bb9062ed9f73ae33 (patch) | |
| tree | 3780b069556ac0d6097bb884d4c93e6821b75b62 | |
| parent | 41b566b62df50e33d3cef866c662b765812f7b21 (diff) | |
| download | ruby-8fc991162a12670301b38174bb9062ed9f73ae33.tar.gz | |
win32/file.c: drop garbage
* win32/file.c (rb_readlink): drop garbage after the substitute
name, as rb_w32_read_reparse_point returns the expected buffer
size but "\??\" prefix is dropped from the result.
* win32/win32.c (w32_readlink): ditto, including NUL-terminator.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@53689 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | win32/file.c | 1 | ||||
| -rw-r--r-- | win32/win32.c | 1 |
3 files changed, 10 insertions, 0 deletions
@@ -1,3 +1,11 @@ +Fri Jan 29 17:40:07 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * win32/file.c (rb_readlink): drop garbage after the substitute + name, as rb_w32_read_reparse_point returns the expected buffer + size but "\??\" prefix is dropped from the result. + + * win32/win32.c (w32_readlink): ditto, including NUL-terminator. + Fri Jan 29 17:07:27 2016 NAKAMURA Usaku <usa@ruby-lang.org> * win32/win32.c (fileattr_to_unixmode, rb_w32_reparse_symlink_p): volume diff --git a/win32/file.c b/win32/file.c index 85aea15d71..3b18a36348 100644 --- a/win32/file.c +++ b/win32/file.c @@ -697,6 +697,7 @@ rb_readlink(VALUE path, rb_encoding *resultenc) enc = resultenc; cp = path_cp = code_page(enc); if (cp == INVALID_CODE_PAGE) cp = CP_UTF8; + len = lstrlenW(wbuf); str = append_wstr(rb_enc_str_new(0, 0, enc), wbuf, len, cp, path_cp, enc); ALLOCV_END(wtmp); return str; diff --git a/win32/win32.c b/win32/win32.c index 35fe5a8557..47408e0375 100644 --- a/win32/win32.c +++ b/win32/win32.c @@ -4888,6 +4888,7 @@ w32_readlink(UINT cp, const char *path, char *buf, size_t bufsize) errno = map_errno(e); return -1; } + len = lstrlenW(wname) + 1; ret = WideCharToMultiByte(cp, 0, wname, len, buf, bufsize, NULL, NULL); ALLOCV_END(wtmp); if (e) { |