diff options
| -rw-r--r-- | dir.c | 8 | ||||
| -rw-r--r-- | win32/dir.h | 1 | ||||
| -rw-r--r-- | win32/win32.c | 52 |
3 files changed, 43 insertions, 18 deletions
@@ -74,6 +74,7 @@ char *strchr(char*,char); #define rmdir(p) rb_w32_urmdir(p) #undef opendir #define opendir(p) rb_w32_uopendir(p) +#define ruby_getcwd() rb_w32_ugetcwd(NULL, 0) #define IS_WIN32 1 #else #define IS_WIN32 0 @@ -1051,10 +1052,14 @@ rb_dir_getwd(void) { char *path; VALUE cwd; - int fsenc = rb_enc_to_index(rb_filesystem_encoding()); + rb_encoding *fs = rb_filesystem_encoding(); + int fsenc = rb_enc_to_index(fs); if (fsenc == ENCINDEX_US_ASCII) fsenc = ENCINDEX_ASCII; path = my_getcwd(); +#ifdef _WIN32 + cwd = rb_str_conv_enc(rb_utf8_str_new_cstr(path), NULL, fs); +#else #ifdef __APPLE__ cwd = rb_str_normalize_ospath(path, strlen(path)); OBJ_TAINT(cwd); @@ -1062,6 +1067,7 @@ rb_dir_getwd(void) cwd = rb_tainted_str_new2(path); #endif rb_enc_associate_index(cwd, fsenc); +#endif xfree(path); return cwd; diff --git a/win32/dir.h b/win32/dir.h index b1f981f257..29c4c1c6d5 100644 --- a/win32/dir.h +++ b/win32/dir.h @@ -33,6 +33,7 @@ long rb_w32_telldir(DIR *); void rb_w32_seekdir(DIR *, long); void rb_w32_rewinddir(DIR *); void rb_w32_closedir(DIR *); +char *rb_w32_ugetcwd(char *, int); #define opendir(s) rb_w32_opendir((s)) #define readdir(d) rb_w32_readdir((d), 0) diff --git a/win32/win32.c b/win32/win32.c index 8b18821f5f..0296f2d3c1 100644 --- a/win32/win32.c +++ b/win32/win32.c @@ -4655,43 +4655,61 @@ clock_getres(clockid_t clock_id, struct timespec *sp) } /* License: Ruby's */ -char * -rb_w32_getcwd(char *buffer, int size) +static char * +w32_getcwd(char *buffer, int size, UINT cp) { - char *p = buffer; - int len; + WCHAR *p; + int wlen, len; - len = GetCurrentDirectory(0, NULL); + len = GetCurrentDirectoryW(0, NULL); if (!len) { errno = map_errno(GetLastError()); return NULL; } - if (p) { + if (buffer && size < len) { + errno = ERANGE; + return NULL; + } + + p = ALLOCA_N(WCHAR, len); + if (!GetCurrentDirectoryW(len, p)) { + errno = map_errno(GetLastError()); + return NULL; + } + + wlen = translate_wchar(p, L'\\', L'/') - p + 1; + len = WideCharToMultiByte(cp, 0, p, wlen, NULL, 0, NULL, NULL); + if (buffer) { if (size < len) { errno = ERANGE; return NULL; } } else { - p = malloc(len); - size = len; - if (!p) { + buffer = malloc(len); + if (!buffer) { errno = ENOMEM; return NULL; } } + WideCharToMultiByte(cp, 0, p, wlen, buffer, len, NULL, NULL); - if (!GetCurrentDirectory(size, p)) { - errno = map_errno(GetLastError()); - if (!buffer) - free(p); - return NULL; - } + return buffer; +} - translate_char(p, '\\', '/', filecp()); +/* License: Ruby's */ +char * +rb_w32_getcwd(char *buffer, int size) +{ + return w32_getcwd(buffer, size, filecp()); +} - return p; +/* License: Ruby's */ +char * +rb_w32_ugetcwd(char *buffer, int size) +{ + return w32_getcwd(buffer, size, CP_UTF8); } /* License: Artistic or GPL */ |