archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-09-16 17:14:01 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

revert r62797, r62784. [Bug #13863]

Browse source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_4@62801 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nagachika 2018-03-18 03:57:37 +00:00
parent 2171d75e9b
commit 3c5452dba1
10 changed files with 75 additions and 152 deletions
Download patch file Download diff file Expand all files Collapse all files

52
win32/win32.c
View file

@ -4654,61 +4654,43 @@ clock_getres(clockid_t clock_id, struct timespec *sp)
}
/* License: Ruby's */
static char *
w32_getcwd(char *buffer, int size, UINT cp)
char *
rb_w32_getcwd(char *buffer, int size)
{
WCHAR *p;
int wlen, len;
char *p = buffer;
int len;
len = GetCurrentDirectoryW(0, NULL);
len = GetCurrentDirectory(0, NULL);
if (!len) {
errno = map_errno(GetLastError());
return NULL;
}
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 (p) {
if (size < len) {
errno = ERANGE;
return NULL;
}
}
else {
buffer = malloc(len);
if (!buffer) {
p = malloc(len);
size = len;
if (!p) {
errno = ENOMEM;
return NULL;
}
}
WideCharToMultiByte(cp, 0, p, wlen, buffer, len, NULL, NULL);
return buffer;
}
if (!GetCurrentDirectory(size, p)) {
errno = map_errno(GetLastError());
if (!buffer)
free(p);
return NULL;
}
/* License: Ruby's */
char *
rb_w32_getcwd(char *buffer, int size)
{
return w32_getcwd(buffer, size, filecp());
}
translate_char(p, '\\', '/', filecp());
/* License: Ruby's */
char *
rb_w32_ugetcwd(char *buffer, int size)
{
return w32_getcwd(buffer, size, CP_UTF8);
return p;
}
/* License: Artistic or GPL */