kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

win32/file.c: direct conversion

Browse source 
* win32/file.c (user_length_in_path): count user name length in
  path.

* win32/file.c (append_wstr): append WCHAR string to Ruby string
  directly without an intermediate buffer, if possible.

* win32/file.c (rb_file_expand_path_internal): use above functions.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@47118 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2014-08-09 11:50:13 +00:00
parent b136c5cd48
commit 8f0543a364
1 changed files with 37 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

83
win32/file.c
View file

@ -189,6 +189,9 @@ code_page(rb_encoding *enc)
if (enc_idx == rb_usascii_encindex() || enc_idx == rb_ascii8bit_encindex()) { if (enc_idx == rb_usascii_encindex() || enc_idx == rb_ascii8bit_encindex()) {
return 1252; return 1252;
} }
if (enc_idx == rb_utf8_encindex()) {
return CP_UTF8;
}
if (0 <= enc_idx && (unsigned int)enc_idx < rb_code_page.count) if (0 <= enc_idx && (unsigned int)enc_idx < rb_code_page.count)
return rb_code_page.table[enc_idx]; return rb_code_page.table[enc_idx];
@ -268,33 +271,39 @@ replace_to_long_name(wchar_t **wfullpath, size_t size, int heap)
return size; return size;
} }
static inline VALUE static inline size_t
get_user_from_path(const wchar_t *wuser, UINT cp, UINT path_cp, rb_encoding *path_encoding) user_length_in_path(const wchar_t *wuser)
{ {
VALUE result, tmp;
const wchar_t *pos = wuser; const wchar_t *pos = wuser;
char *user;
long size;
while (!IS_DIR_SEPARATOR_P(*pos) && *pos != '\0') while (!IS_DIR_SEPARATOR_P(*pos) && *pos != '\0')
pos++; pos++;
user = wstr_to_mbstr(cp, wuser, (int)(pos - wuser), &size); return pos - wuser;
}
/* convert to VALUE and set the path encoding */ static VALUE
if (path_cp == INVALID_CODE_PAGE) { append_wstr(VALUE dst, const wchar_t *ws, size_t len, UINT cp, UINT path_cp, rb_encoding *path_encoding)
tmp = rb_enc_str_new(user, size, rb_utf8_encoding()); {
result = rb_str_encode(tmp, rb_enc_from_encoding(path_encoding), 0, Qnil); long olen, nlen = (long)len;
rb_str_resize(tmp, 0);
if (cp == path_cp) {
nlen = WideCharToMultiByte(cp, 0, ws, len, NULL, 0, NULL, NULL);
olen = RSTRING_LEN(dst);
rb_str_modify_expand(dst, nlen);
WideCharToMultiByte(cp, 0, ws, len, RSTRING_PTR(dst) + olen, nlen, NULL, NULL);
rb_enc_associate(dst, path_encoding);
rb_str_set_len(dst, nlen);
} }
else { else {
result = rb_enc_str_new(user, size, path_encoding); const int replaceflags = ECONV_UNDEF_REPLACE|ECONV_INVALID_REPLACE;
char *utf8str = wstr_to_mbstr(CP_UTF8, ws, (int)len, &nlen);
rb_econv_t *ec = rb_econv_open("UTF-8", rb_enc_name(path_encoding), replaceflags);
dst = rb_econv_append(ec, utf8str, nlen, dst, replaceflags);
rb_econv_close(ec);
free(utf8str);
} }
return dst;
if (user)
xfree(user);
return result;
} }
VALUE VALUE
@ -392,12 +401,14 @@ rb_file_expand_path_internal(VALUE fname, VALUE dname, int abs_mode, int long_na
} }
} }
else if (abs_mode == 0 && wpath_len >= 2 && wpath_pos[0] == L'~') { else if (abs_mode == 0 && wpath_len >= 2 && wpath_pos[0] == L'~') {
result = get_user_from_path(wpath_pos + 1, cp, path_cp, path_encoding); result = rb_str_new_cstr("can't find user ");
result = append_wstr(result, wpath_pos + 1, user_length_in_path(wpath_pos + 1),
cp, path_cp, path_encoding);
if (wpath) if (wpath)
xfree(wpath); xfree(wpath);
rb_raise(rb_eArgError, "can't find user %s", StringValuePtr(result)); rb_exc_raise(rb_exc_new_str(rb_eArgError, result));
} }
/* convert dir */ /* convert dir */
@ -466,14 +477,16 @@ rb_file_expand_path_internal(VALUE fname, VALUE dname, int abs_mode, int long_na
} }
} }
else if (abs_mode == 0 && wdir_len >= 2 && wdir_pos[0] == L'~') { else if (abs_mode == 0 && wdir_len >= 2 && wdir_pos[0] == L'~') {
result = get_user_from_path(wdir_pos + 1, cp, path_cp, path_encoding); result = rb_str_new_cstr("can't find user ");
result = append_wstr(result, wdir_pos + 1, user_length_in_path(wdir_pos + 1),
cp, path_cp, path_encoding);
if (wpath) if (wpath)
free(wpath); free(wpath);
if (wdir) if (wdir)
free(wdir); free(wdir);
rb_raise(rb_eArgError, "can't find user %s", StringValuePtr(result)); rb_exc_raise(rb_exc_new_str(rb_eArgError, result));
} }
} }
@ -589,32 +602,9 @@ rb_file_expand_path_internal(VALUE fname, VALUE dname, int abs_mode, int long_na
/* sanitize backslashes with forwardslashes */ /* sanitize backslashes with forwardslashes */
replace_wchar(wfullpath, L'\\', L'/'); replace_wchar(wfullpath, L'\\', L'/');
/* convert to char * */
size = WideCharToMultiByte(cp, 0, wfullpath, size, NULL, 0, NULL, NULL);
if (size > (size_t)RSTRING_LEN(result)) {
rb_str_modify(result);
rb_str_resize(result, size);
}
WideCharToMultiByte(cp, 0, wfullpath, size, RSTRING_PTR(result), size, NULL, NULL);
rb_str_set_len(result, size);
/* convert to VALUE and set the path encoding */ /* convert to VALUE and set the path encoding */
if (path_cp == INVALID_CODE_PAGE) { rb_str_set_len(result, 0);
VALUE tmp; result = append_wstr(result, wfullpath, size, cp, path_cp, path_encoding);
size_t len;
rb_enc_associate(result, rb_utf8_encoding());
ENC_CODERANGE_CLEAR(result);
tmp = rb_str_encode(result, rb_enc_from_encoding(path_encoding), 0, Qnil);
len = RSTRING_LEN(tmp);
rb_str_modify(result);
rb_str_resize(result, len);
memcpy(RSTRING_PTR(result), RSTRING_PTR(tmp), len);
rb_str_resize(tmp, 0);
}
rb_enc_associate(result, path_encoding);
ENC_CODERANGE_CLEAR(result);
/* makes the result object tainted if expanding tainted strings or returning modified path */ /* makes the result object tainted if expanding tainted strings or returning modified path */
if (tainted) if (tainted)
@ -639,6 +629,7 @@ rb_file_expand_path_internal(VALUE fname, VALUE dname, int abs_mode, int long_na
if (fullpath) if (fullpath)
xfree(fullpath); xfree(fullpath);
rb_enc_associate(result, path_encoding);
return result; return result;
} }