提交 59c1b2d9 编写于 作者: L liubb 提交者: Gitee

update js/builtin/filekit/src/nativeapi_fs_impl.c.

utils support simulator
上级 16dfe4b7
...@@ -24,6 +24,9 @@ ...@@ -24,6 +24,9 @@
#include <sys/types.h> #include <sys/types.h>
#include <unistd.h> #include <unistd.h>
#include "nativeapi_config.h" #include "nativeapi_config.h"
#if (defined _WIN32 || defined _WIN64)
#include "shlwapi.h"
#endif
#define BUFFER_SIZE 512 #define BUFFER_SIZE 512
...@@ -44,9 +47,16 @@ static bool IsValidPath(const char* path) ...@@ -44,9 +47,16 @@ static bool IsValidPath(const char* path)
static int GetRealPath(const char* originPath, char* trustPath, size_t tPathLen) static int GetRealPath(const char* originPath, char* trustPath, size_t tPathLen)
{ {
#if (defined _WIN32 || defined _WIN64)
if (PathCanonicalize(originPath, trustPath) == true) {
return NATIVE_SUCCESS;
}
#else
if (realpath(originPath, trustPath) != NULL) { if (realpath(originPath, trustPath) != NULL) {
return NATIVE_SUCCESS; return NATIVE_SUCCESS;
} }
#endif
if (errno == ENOENT) { if (errno == ENOENT) {
if (strncpy_s(trustPath, tPathLen, originPath, strlen(originPath)) == EOK) { if (strncpy_s(trustPath, tPathLen, originPath, strlen(originPath)) == EOK) {
return NATIVE_SUCCESS; return NATIVE_SUCCESS;
...@@ -124,7 +134,11 @@ static int MakeParent(const char* path, char* firstPath, size_t fPathLen, int* d ...@@ -124,7 +134,11 @@ static int MakeParent(const char* path, char* firstPath, size_t fPathLen, int* d
free(fullPath); free(fullPath);
return ERROR_CODE_PARAM; return ERROR_CODE_PARAM;
} }
#if (defined _WIN32 || defined _WIN64)
ret = mkdir(fullPath);
#else
ret = mkdir(fullPath, S_IRUSR | S_IWUSR | S_IXUSR); ret = mkdir(fullPath, S_IRUSR | S_IWUSR | S_IXUSR);
#endif
if ((ret == NATIVE_SUCCESS) && (*dirNum == 1)) { if ((ret == NATIVE_SUCCESS) && (*dirNum == 1)) {
if ((strcpy_s(firstPath, fPathLen, fullPath) != EOK)) { if ((strcpy_s(firstPath, fPathLen, fullPath) != EOK)) {
free(fullPath); free(fullPath);
...@@ -435,7 +449,12 @@ int CreateDirImpl(const char* fileName, bool recursive) ...@@ -435,7 +449,12 @@ int CreateDirImpl(const char* fileName, bool recursive)
return MkdirRecursive(fileName); return MkdirRecursive(fileName);
} }
if (mkdir(fileName, S_IRUSR | S_IWUSR | S_IXUSR) != NATIVE_SUCCESS) { #if (defined _WIN32 || defined _WIN64)
int ret = mkdir(fileName);
#else
int ret = mkdir(fileName, S_IRUSR | S_IWUSR | S_IXUSR);
#endif
if (ret != NATIVE_SUCCESS) {
return (-errno); return (-errno);
} }
return NATIVE_SUCCESS; return NATIVE_SUCCESS;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册