Changeset 331 for EcnlProtoTool/trunk/mrbgems/mruby-io/src/io.c

Timestamp:

Jan 21, 2018, 12:10:09 AM (6 years ago)

Author:

coas-nagasima

Message:

prototoolに関連するプロジェクトをnewlibからmuslを使うよう変更・更新
ntshellをnewlibの下位の実装から、muslのsyscallの実装に変更・更新
以下のOSSをアップデート
・mruby-1.3.0
・musl-1.1.18
・onigmo-6.1.3
・tcc-0.9.27
以下のOSSを追加
・openssl-1.1.0e
・curl-7.57.0
・zlib-1.2.11
以下のmrbgemsを追加
・iij/mruby-digest
・iij/mruby-env
・iij/mruby-errno
・iij/mruby-iijson
・iij/mruby-ipaddr
・iij/mruby-mock
・iij/mruby-require
・iij/mruby-tls-openssl

File:

• EcnlProtoTool/trunk/mrbgems/mruby-io/src/io.c (modified) (15 diffs)

EcnlProtoTool/trunk/mrbgems/mruby-io/src/io.c

@@ -190 +190 @@
 }
 
-#if !defined(_WIN32) && !defined(_WIN64) && !defined(__NEWLIB__)
+#ifndef _WIN32
 static int
 mrb_cloexec_pipe(mrb_state *mrb, int fildes[2])
@@ -265 +265 @@
 #endif
 
-#if !defined(_WIN32) && !defined(_WIN64) && !defined(__NEWLIB__)
+#ifndef _WIN32
 static int
 option_to_fd(mrb_state *mrb, mrb_value obj, const char *key)
@@ -390 +390 @@
 
       mrb_iv_set(mrb, io, mrb_intern_cstr(mrb, "@buf"), mrb_str_new_cstr(mrb, ""));
-      mrb_iv_set(mrb, io, mrb_intern_cstr(mrb, "@pos"), mrb_fixnum_value(0));
 
       fptr = mrb_io_alloc(mrb);
@@ -444 +443 @@
 
   mrb_iv_set(mrb, io, mrb_intern_cstr(mrb, "@buf"), mrb_str_new_cstr(mrb, ""));
-  mrb_iv_set(mrb, io, mrb_intern_cstr(mrb, "@pos"), mrb_fixnum_value(0));
 
   fptr = (struct mrb_io *)DATA_PTR(io);
@@ -488 +486 @@
   }
 
-#if !defined(_WIN32) && !defined(_WIN64) && !defined(__NEWLIB__)
+#if !defined(_WIN32) && !defined(_WIN64)
   if (fptr->pid != 0) {
     pid_t pid;
@@ -557 +555 @@
 mrb_cloexec_open(mrb_state *mrb, const char *pathname, mrb_int flags, mrb_int mode)
 {
+  mrb_value emsg;
   int fd, retry = FALSE;
 
@@ -577 +576 @@
       }
     }
-    mrb_sys_fail(mrb, "open");
+
+    emsg = mrb_format(mrb, "open %S", mrb_str_new_cstr(mrb, pathname));
+    mrb_str_modify(mrb, mrb_str_ptr(emsg));
+    mrb_sys_fail(mrb, RSTRING_PTR(emsg));
   }
 
@@ -620 +622 @@
   mrb_get_args(mrb, "i|S", &maxlen, &buf);
   if (maxlen < 0) {
-    return mrb_nil_value();
+    mrb_raise(mrb, E_ARGUMENT_ERROR, "negative expanding string size");
+  }
+  else if (maxlen == 0) {
+    return mrb_str_new(mrb, NULL, maxlen);
   }
 
@@ -626 +631 @@
     buf = mrb_str_new(mrb, NULL, maxlen);
   }
+
   if (RSTRING_LEN(buf) != maxlen) {
     buf = mrb_str_resize(mrb, buf, maxlen);
-  }
-
-  fptr = (struct mrb_io *)mrb_get_datatype(mrb, io, &mrb_io_type);
+  } else {
+    mrb_str_modify(mrb, RSTRING(buf));
+  }
+
+  fptr = (struct mrb_io *)io_get_open_fptr(mrb, io);
+  if (!fptr->readable) {
+    mrb_raise(mrb, E_IO_ERROR, "not opened for reading");
+  }
   ret = read(fptr->fd, RSTRING_PTR(buf), maxlen);
   switch (ret) {
@@ -702 +713 @@
   }
   length = write(fd, RSTRING_PTR(buf), RSTRING_LEN(buf));
+  if (length == -1) {
+    mrb_sys_fail(mrb, 0);
+  }
 
   return mrb_fixnum_value(length);
@@ -773 +787 @@
 }
 
-#if !defined(_WIN32) && !defined(_WIN64) && !defined(__NEWLIB__)
+#ifndef _WIN32
 static mrb_value
 mrb_io_s_pipe(mrb_state *mrb, mrb_value klass)
@@ -789 +803 @@
   r = mrb_obj_value(mrb_data_object_alloc(mrb, mrb_class_ptr(klass), NULL, &mrb_io_type));
   mrb_iv_set(mrb, r, mrb_intern_cstr(mrb, "@buf"), mrb_str_new_cstr(mrb, ""));
-  mrb_iv_set(mrb, r, mrb_intern_cstr(mrb, "@pos"), mrb_fixnum_value(0));
   fptr_r = mrb_io_alloc(mrb);
   fptr_r->fd = pipes[0];
@@ -800 +813 @@
   w = mrb_obj_value(mrb_data_object_alloc(mrb, mrb_class_ptr(klass), NULL, &mrb_io_type));
   mrb_iv_set(mrb, w, mrb_intern_cstr(mrb, "@buf"), mrb_str_new_cstr(mrb, ""));
-  mrb_iv_set(mrb, w, mrb_intern_cstr(mrb, "@pos"), mrb_fixnum_value(0));
   fptr_w = mrb_io_alloc(mrb);
   fptr_w->fd = pipes[1];
@@ -1072 +1084 @@
 
   mrb_include_module(mrb, io, mrb_module_get(mrb, "Enumerable")); /* 15.2.20.3 */
-#if !defined(_WIN32) && !defined(_WIN64) && !defined(__NEWLIB__)
+#ifndef _WIN32
   mrb_define_class_method(mrb, io, "_popen",  mrb_io_s_popen,   MRB_ARGS_ANY());
   mrb_define_class_method(mrb, io, "_sysclose",  mrb_io_s_sysclose, MRB_ARGS_REQ(1));
@@ -1079 +1091 @@
   mrb_define_class_method(mrb, io, "select",  mrb_io_s_select,  MRB_ARGS_ANY());
   mrb_define_class_method(mrb, io, "sysopen", mrb_io_s_sysopen, MRB_ARGS_ANY());
-#if !defined(_WIN32) && !defined(_WIN64) && !defined(__NEWLIB__)
+#ifndef _WIN32
   mrb_define_class_method(mrb, io, "_pipe", mrb_io_s_pipe, MRB_ARGS_NONE());
 #endif