Changeset 331 for EcnlProtoTool/trunk/mrbgems/mruby-io/src/file.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/file.c (modified) (7 diffs)

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

@@ -46 +46 @@
   #include <pwd.h>
 #endif
-#if defined(__NEWLIB__)
-  #define _MAX_DIR              253
-  #define _MAX_DRIVE    2
-  #define PATH_MAX              (_MAX_DRIVE + _MAX_DIR)
-  #define MAXPATHLEN    (_MAX_DRIVE + _MAX_DIR)
-#endif
 
 #define FILE_SEPARATOR "/"
@@ -81 +75 @@
 mrb_file_s_umask(mrb_state *mrb, mrb_value klass)
 {
-#if defined(_WIN32) || defined(_WIN64) || defined(__NEWLIB__)
+#if defined(_WIN32) || defined(_WIN64)
   /* nothing to do on windows */
   return mrb_fixnum_value(0);
@@ -126 +120 @@
   dst = mrb_string_value_cstr(mrb, &to);
   if (rename(src, dst) < 0) {
+#if defined(_WIN32) || defined(_WIN64)
     if (CHMOD(dst, 0666) == 0 && UNLINK(dst) == 0 && rename(src, dst) == 0) {
       return mrb_fixnum_value(0);
     }
+#endif
     mrb_sys_fail(mrb, mrb_str_to_cstr(mrb, mrb_format(mrb, "(%S, %S)", from, to)));
   }
@@ -253 +249 @@
 mrb_file__gethome(mrb_state *mrb, mrb_value klass)
 {
-#if !defined(_WIN32) && !defined(_WIN64) && !defined(__NEWLIB__)
+#ifndef _WIN32
   mrb_value username;
   int argc;
@@ -288 +284 @@
 mrb_file_flock(mrb_state *mrb, mrb_value self)
 {
-#if defined(_WIN32) || defined(_WIN64) || defined(sun) || defined(__NEWLIB__)
+#if defined(_WIN32) || defined(_WIN64) || defined(sun)
   mrb_raise(mrb, E_NOTIMP_ERROR, "flock is not supported on Illumos/Solaris/Windows");
 #else
@@ -322 +318 @@
 mrb_file_s_symlink(mrb_state *mrb, mrb_value klass)
 {
-#if defined(_WIN32) || defined(_WIN64) || defined(__NEWLIB__)
+#if defined(_WIN32) || defined(_WIN64)
   mrb_raise(mrb, E_NOTIMP_ERROR, "symlink is not supported on this platform");
 #else
@@ -362 +358 @@
 static mrb_value
 mrb_file_s_readlink(mrb_state *mrb, mrb_value klass) {
-#if defined(_WIN32) || defined(_WIN64) || defined(__NEWLIB__)
+#if defined(_WIN32) || defined(_WIN64)
   mrb_raise(mrb, E_NOTIMP_ERROR, "readlink is not supported on this platform");
   return mrb_nil_value(); // unreachable