Embedded/pikapython
1
0
Fork 0
mirror of https://gitee.com/Lyon1998/pikapython.git synced 2025-01-15 17:02:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix getcwd on win32

Browse Source
This commit is contained in:
lyon 2023-12-03 14:55:29 +08:00
parent fba5e0b8ae
commit fc63ab8e6a
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/PikaPlatform.c
View File

@ -33,10 +33,6 @@
#include <io.h>
#endif
#if defined(_WIN32)
#include <dirent.h>
#endif
#if defined(__linux) || PIKA_LINUX_COMPATIBLE
#include <dirent.h>
#include <sys/stat.h>
@ -44,10 +40,6 @@
#include "unistd.h"
#endif
#if (defined(__linux) || PIKA_LINUX_COMPATIBLE)
#include <dirent.h>
#endif
void pikaFree(void* mem, uint32_t size);
void* pikaMalloc(uint32_t size);
int pika_pvsprintf(char** buff, const char* fmt, va_list args);
@ -287,8 +279,15 @@ PIKA_WEAK long pika_platform_ftell(FILE* stream) {
}
PIKA_WEAK char* pika_platform_getcwd(char* buf, size_t size) {
#if defined(__linux) || defined(_WIN32)
#if defined(__linux)
return getcwd(buf, size);
#elif defined(_WIN32)
if (!GetCurrentDirectoryA(size, buf)) {
return NULL;
}
else {
return buf;
}
#else
WEAK_FUNCTION_NEED_OVERRIDE_ERROR_LOWLEVEL(_);
#endif
@ -479,7 +478,7 @@ PIKA_WEAK char** pika_platform_listdir(const char* path, int* count) {
struct _finddata_t fb;
intptr_t handle = 0;
char dirpath[256] = {0};
char* currentPath = _getcwd(dirpath, 256);
char* currentPath = pika_platform_getcwd(dirpath, sizeof dirpath);
strcat(dirpath, path);
strcat(dirpath, "\\*");