From 868450acbb14b1bf5cd2da7b1b09a195e88a6bd5 Mon Sep 17 00:00:00 2001
From: ruki <waruqi@gmail.com>
Date: Fri, 21 Feb 2020 22:47:02 +0800
Subject: improve strerror and os

---
 core/src/tbox/tbox           |  2 +-
 core/src/xmake/os/cpfile.c   |  4 +---
 core/src/xmake/os/strerror.c | 20 +++++++++++---------
 xmake/core/base/os.lua       |  7 ++++---
 4 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/core/src/tbox/tbox b/core/src/tbox/tbox
index 37ba0093d..14b85615d 160000
--- a/core/src/tbox/tbox
+++ b/core/src/tbox/tbox
@@ -1 +1 @@
-Subproject commit 37ba0093d152b0d892925aee0e0d7b2ea66360ca
+Subproject commit 14b85615dda8a1daf8abdef8883627be6432e86d
diff --git a/core/src/xmake/os/cpfile.c b/core/src/xmake/os/cpfile.c
index e896c1136..b3aa56f4d 100644
--- a/core/src/xmake/os/cpfile.c
+++ b/core/src/xmake/os/cpfile.c
@@ -43,9 +43,7 @@ tb_int_t xm_os_cpfile(lua_State* lua)
     tb_char_t const* dst = luaL_checkstring(lua, 2);
     tb_check_return_val(src && dst, 0);
 
-    // done os.cpfile(src, dst) 
+    // do copy
     lua_pushboolean(lua, tb_file_copy(src, dst));
-
-    // ok
     return 1;
 }
diff --git a/core/src/xmake/os/strerror.c b/core/src/xmake/os/strerror.c
index 399f0dedd..1a88546ec 100644
--- a/core/src/xmake/os/strerror.c
+++ b/core/src/xmake/os/strerror.c
@@ -29,9 +29,7 @@
  * includes
  */
 #include "prefix.h"
-#ifdef TB_CONFIG_OS_WINDOWS
-#   include <windows.h>
-#else
+#if !defined(TB_CONFIG_OS_WINDOWS) || defined(TB_COMPILER_LIKE_UNIX)
 #   include <errno.h>
 #   include <string.h>
 #endif
@@ -44,13 +42,17 @@ tb_int_t xm_os_strerror(lua_State* lua)
     // check
     tb_assert_and_check_return_val(lua, 0);
 
-    // done os.strerror() 
-#ifdef TB_CONFIG_OS_WINDOWS
-    lua_pushstring(lua, tb_state_cstr(tb_syserror_state()));
+    // get syserror state
+    tb_size_t syserror = tb_syserror_state();
+    if (syserror != TB_STATE_SYSERROR_UNKNOWN_ERROR)
+        lua_pushstring(lua, tb_state_cstr(syserror));
+    else
+    {
+#if defined(TB_CONFIG_OS_WINDOWS) && !defined(TB_COMPILER_LIKE_UNIX)
+        lua_pushstring(lua, tb_state_cstr(syserror));
 #else
-    lua_pushstring(lua, strerror(errno));
+        lua_pushstring(lua, strerror(errno));
 #endif
-
-    // ok
+    }
     return 1;
 }
diff --git a/xmake/core/base/os.lua b/xmake/core/base/os.lua
index 6b1366ac8..de67d636b 100644
--- a/xmake/core/base/os.lua
+++ b/xmake/core/base/os.lua
@@ -440,8 +440,9 @@ function os.rm(...)
 
     -- remove directories
     for _, filedir in ipairs(os.argw(args)) do
-        if not os._rm(filedir) then
-            return false, string.format("remove: %s failed!", filedir)
+        local ok, errors = os._rm(filedir)
+        if not ok then
+            return false, errors
         end
     end
 
@@ -455,7 +456,7 @@ function os.ln(filedir, symfile)
         return false, string.format("symlink is not supported!")
     end
     if not os.link(filedir, symfile) then
-        return false, string.format("link %s to %s failed!", filedir, symfile)
+        return false, string.format("cannot link %s to %s, error: %s", filedir, symfile, os.strerror())
     end
     return true
 end
-- 
cgit v1.3.1