From 2368dbdfa3c438b614a4727bde7cacac2d0a87a9 Mon Sep 17 00:00:00 2001 From: nagachika Date: Fri, 16 Mar 2018 17:34:44 +0000 Subject: merge revision(s) 58745,58780,59040,60743: [Backport #13863] rb_w32_ugetcwd: UTF-8 version getcwd * dir.c (rb_dir_getwd): convert from UTF-8. * win32/win32.c (w32_getcwd): codepage aware getcwd using GetCurrentDirectoryW. potential memory leak * dir.c (rb_dir_getwd): get rid of potential memory leak. * util.c (ruby_getcwd): ditto. file.c: realpath in OS path encoding * dir.c (rb_dir_getwd_ospath): return cwd path in the OS path encoding. * file.c (rb_realpath_internal): work in the OS path encoding load.c: cwd encoding * load.c (rb_get_expanded_load_path): save cwd cache in OS path encoding, to get rid of unnecessary conversion and infinite loading when it needs encoding conversion. [ruby-dev:50221] [Bug #13863] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_4@62784 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- internal.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'internal.h') diff --git a/internal.h b/internal.h index 95fc9822e1..c0bbe11455 100644 --- a/internal.h +++ b/internal.h @@ -982,6 +982,9 @@ void ruby_register_rollback_func_for_ensure(VALUE (*ensure_func)(ANYARGS), VALUE /* debug.c */ PRINTF_ARGS(void ruby_debug_printf(const char*, ...), 1, 2); +/* dir.c */ +VALUE rb_dir_getwd_ospath(void); + /* dmyext.c */ void Init_enc(void); void Init_ext(void); -- cgit v1.2.3