xxq250
/
Nasal-Interpreter
mirror of https://github.com/ValKmjolnir/Nasal-Interpreter.git
1
0
Fork 0
Code Issues Actions 1 Packages Projects Releases Wiki Activity

🐛 fix error use of FindFirstFile.

This commit is contained in:
ValKmjolnir 2022-07-16 17:47:43 +08:00
parent 577ecd14df
commit 51f780e637
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
nasal_builtin.h
View File

@ -768,7 +768,7 @@ nasal_ref builtin_open(nasal_ref* local,nasal_gc& gc)
return builtin_err("open","\"mode\" must be string"); return builtin_err("open","\"mode\" must be string");
FILE* res=fopen(name.str().c_str(),mode.str().c_str()); FILE* res=fopen(name.str().c_str(),mode.str().c_str());
if(!res) if(!res)
return builtin_err("open","failed to open file <"+name.str()+"> errno "+std::to_string(errno)); return builtin_err("open","failed to open file <"+name.str()+">");
nasal_ref ret=gc.alloc(vm_obj); nasal_ref ret=gc.alloc(vm_obj);
ret.obj().type=nasal_obj::file; ret.obj().type=nasal_obj::file;
ret.obj().ptr=(void*)res; ret.obj().ptr=(void*)res;
@ -1044,13 +1044,13 @@ nasal_ref builtin_opendir(nasal_ref* local,nasal_gc& gc)
#ifdef _MSC_VER #ifdef _MSC_VER
WIN32_FIND_DATA data; WIN32_FIND_DATA data;
HANDLE p; HANDLE p;
p=FindFirstFile(path.str().c_str(),&data); p=FindFirstFile((path.str()+"\\*.*").c_str(),&data);
if(p==INVALID_HANDLE_VALUE) if(p==INVALID_HANDLE_VALUE)
return builtin_err("opendir","cannot open dir <"+path.str()+"> errno "+std::to_string(errno)); return builtin_err("opendir","cannot open dir <"+path.str()+">");
#else #else
DIR* p=opendir(path.str().c_str()); DIR* p=opendir(path.str().c_str());
if(!p) if(!p)
return builtin_err("opendir","cannot open dir <"+path.str()+"> errno "+std::to_string(errno)); return builtin_err("opendir","cannot open dir <"+path.str()+">");
#endif #endif
nasal_ref ret=gc.alloc(vm_obj); nasal_ref ret=gc.alloc(vm_obj);
ret.obj().type=nasal_obj::dir; ret.obj().type=nasal_obj::dir;