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

* io.c (rb_sysopen): moved sysopen_struct from rb_sysopen_internal.

Browse source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@24596 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2009-08-20 14:56:23 +00:00
parent 4c5d7d53b2
commit 36c9cddf6c
2 changed files with 48 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,3 +1,7 @@
Thu Aug 20 23:56:15 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
* io.c (rb_sysopen): moved sysopen_struct from rb_sysopen_internal.
Thu Aug 20 23:39:51 2009 Yusuke Endoh <mame@tsg.ne.jp> Thu Aug 20 23:39:51 2009 Yusuke Endoh <mame@tsg.ne.jp>
* parse.y (reduce_nodes_gen): preserve NODE_FL_NEWLINE flag during * parse.y (reduce_nodes_gen): preserve NODE_FL_NEWLINE flag during

74
io.c
View file

@ -4406,7 +4406,7 @@ rb_io_extract_modeenc(VALUE *vmode_p, VALUE *vperm_p, VALUE opthash,
} }
struct sysopen_struct { struct sysopen_struct {
const char *fname; VALUE fname;
int oflags; int oflags;
mode_t perm; mode_t perm;
#ifdef _WIN32 #ifdef _WIN32
@ -4414,62 +4414,76 @@ struct sysopen_struct {
#endif #endif
}; };
static VALUE
sysopen_func(void *ptr)
{
struct sysopen_struct *data = ptr;
#ifdef _WIN32 #ifdef _WIN32
if (data->wchar) static rb_encoding *
return (VALUE)rb_w32_wopen((WCHAR *)data->fname, data->oflags, w32_utf16(void)
data->perm);
#endif
return (VALUE)open(data->fname, data->oflags, data->perm);
}
static int
rb_sysopen_internal(VALUE fname, int oflags, mode_t perm)
{ {
#ifdef _WIN32
static rb_encoding *utf16 = (rb_encoding *)-1; static rb_encoding *utf16 = (rb_encoding *)-1;
#endif
struct sysopen_struct data;
data.fname = RSTRING_PTR(fname);
data.oflags = oflags;
data.perm = perm;
#ifdef _WIN32
if (utf16 == (rb_encoding *)-1) { if (utf16 == (rb_encoding *)-1) {
utf16 = rb_enc_find("UTF-16LE"); utf16 = rb_enc_find("UTF-16LE");
if (utf16 == rb_ascii8bit_encoding()) if (utf16 == rb_ascii8bit_encoding())
utf16 = NULL; utf16 = NULL;
} }
return utf16;
}
static int
w32_conv_to_utf16(volatile VALUE *strp)
{
rb_encoding *utf16 = w32_utf16();
if (utf16) { if (utf16) {
VALUE wfname = rb_str_encode(fname, rb_enc_from_encoding(utf16), 0, VALUE wstr = rb_str_encode(*strp, rb_enc_from_encoding(utf16), 0, Qnil);
Qnil); rb_enc_str_buf_cat(wstr, "", 1, utf16); /* workaround */
rb_enc_str_buf_cat(wfname, "", 1, utf16); /* workaround */ *strp = wstr;
data.fname = RSTRING_PTR(wfname); return 1;
data.wchar = 1;
} }
else { else {
data.wchar = 0; return 0;
} }
}
#endif #endif
return (int)rb_thread_blocking_region(sysopen_func, &data, RUBY_UBF_IO, 0);
static VALUE
sysopen_func(void *ptr)
{
const struct sysopen_struct *data = ptr;
const char *fname = RSTRING_PTR(data->fname);
#ifdef _WIN32
if (data->wchar)
return (VALUE)rb_w32_wopen((WCHAR *)fname, data->oflags, data->perm);
#endif
return (VALUE)open(fname, data->oflags, data->perm);
}
static inline int
rb_sysopen_internal(const struct sysopen_struct *data)
{
return (int)rb_thread_blocking_region(sysopen_func, data, RUBY_UBF_IO, 0);
} }
static int static int
rb_sysopen(VALUE fname, int oflags, mode_t perm) rb_sysopen(VALUE fname, int oflags, mode_t perm)
{ {
int fd; int fd;
struct sysopen_struct data;
#ifdef O_BINARY #ifdef O_BINARY
oflags |= O_BINARY; oflags |= O_BINARY;
#endif #endif
data.fname = fname;
data.oflags = oflags;
data.perm = perm;
#ifdef _WIN32
if ((data.wchar = w32_conv_to_utf16(&data.fname)) != 0) {
OBJ_FREEZE(data.fname);
}
#endif
fd = rb_sysopen_internal(fname, oflags, perm); fd = rb_sysopen_internal(&data);
if (fd < 0) { if (fd < 0) {
if (errno == EMFILE || errno == ENFILE) { if (errno == EMFILE || errno == ENFILE) {
rb_gc(); rb_gc();
fd = rb_sysopen_internal(fname, oflags, perm); fd = rb_sysopen_internal(&data);
} }
if (fd < 0) { if (fd < 0) {
rb_sys_fail(RSTRING_PTR(fname)); rb_sys_fail(RSTRING_PTR(fname));