archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-08-23 13:04:13 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

win32.c: rb_dir_getwd_ospath

Browse source 
* win32/win32.c (rb_dir_getwd_ospath): Windows implementation
  moved from dir.c.  get rid of freeing malloced memory by xfree.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@59061 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2017-06-12 00:18:30 +00:00
parent 5aff6f2948
commit ff5e3b98a0
2 changed files with 32 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

33
win32/win32.c
View file

@ -4656,7 +4656,7 @@ clock_getres(clockid_t clock_id, struct timespec *sp)
/* License: Ruby's */
static char *
w32_getcwd(char *buffer, int size, UINT cp)
w32_getcwd(char *buffer, int size, UINT cp, void *alloc(int, void *), void *arg)
{
WCHAR *p;
int wlen, len;
@ -4687,7 +4687,7 @@ w32_getcwd(char *buffer, int size, UINT cp)
}
}
else {
buffer = malloc(len);
buffer = (*alloc)(len, arg);
if (!buffer) {
errno = ENOMEM;
return NULL;
@ -4698,18 +4698,43 @@ w32_getcwd(char *buffer, int size, UINT cp)
return buffer;
}
/* License: Ruby's */
static void *
getcwd_alloc(int size, void *dummy)
{
return malloc(size);
}
/* License: Ruby's */
char *
rb_w32_getcwd(char *buffer, int size)
{
return w32_getcwd(buffer, size, filecp());
return w32_getcwd(buffer, size, filecp(), getcwd_alloc, NULL);
}
/* License: Ruby's */
char *
rb_w32_ugetcwd(char *buffer, int size)
{
return w32_getcwd(buffer, size, CP_UTF8);
return w32_getcwd(buffer, size, CP_UTF8, getcwd_alloc, NULL);
}
/* License: Ruby's */
static void *
getcwd_value(int size, void *arg)
{
VALUE str = *(VALUE *)arg = rb_utf8_str_new(0, size - 1);
OBJ_TAINT(str);
return RSTRING_PTR(str);
}
/* License: Ruby's */
VALUE
rb_dir_getwd_ospath(void)
{
VALUE cwd = Qnil;
w32_getcwd(NULL, 0, CP_UTF8, getcwd_value, &cwd);
return cwd;
}
/* License: Artistic or GPL */