aerscript/Aer
0
5
Fork 0
Code Issues 6 Pull Requests Releases 2 Wiki Activity

Finally fix #16. I hope at least.

Browse Source
This commit is contained in:
Rafal Kupiec 2018-07-24 10:10:09 +02:00
parent a9637d2c8a
commit d3be8d2a1a
Signed by: belliash
GPG Key ID: 4E829243E0CFE6B4
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
engine/vfs.c
View File

@ -2867,6 +2867,7 @@ PH7_PRIVATE void *PH7_StreamOpenHandle(ph7_vm *pVm, const ph7_io_stream *pStream
int iFlags, int use_include, ph7_value *pResource, int bPushInclude, int *pNew) { int iFlags, int use_include, ph7_value *pResource, int bPushInclude, int *pNew) {
void *pHandle = 0; /* cc warning */ void *pHandle = 0; /* cc warning */
SyString sFile; SyString sFile;
char *sFilePath[PATH_MAX + 1];
int rc; int rc;
if(pStream == 0) { if(pStream == 0) {
/* No such stream device */ /* No such stream device */
@ -2880,7 +2881,9 @@ PH7_PRIVATE void *PH7_StreamOpenHandle(ph7_vm *pVm, const ph7_io_stream *pStream
#endif #endif
(sFile.nByte > 1 && sFile.zString[0] == '.' && sFile.zString[1] == '/') || (sFile.nByte > 1 && sFile.zString[0] == '.' && sFile.zString[1] == '/') ||
(sFile.nByte > 2 && sFile.zString[0] == '.' && sFile.zString[1] == '.' && sFile.zString[2] == '/')) { (sFile.nByte > 2 && sFile.zString[0] == '.' && sFile.zString[1] == '.' && sFile.zString[2] == '/')) {
/* Open the file directly */ /* Get real path to the included file */
SyRealPath(zFile, sFilePath);
/* Open the file directly */
rc = pStream->xOpen(zFile, iFlags, pResource, &pHandle); rc = pStream->xOpen(zFile, iFlags, pResource, &pHandle);
} else { } else {
SyString *pPath; SyString *pPath;
@ -2905,6 +2908,8 @@ PH7_PRIVATE void *PH7_StreamOpenHandle(ph7_vm *pVm, const ph7_io_stream *pStream
/* Try to open the file */ /* Try to open the file */
rc = pStream->xOpen((const char *)SyBlobData(&sWorker), iFlags, pResource, &pHandle); rc = pStream->xOpen((const char *)SyBlobData(&sWorker), iFlags, pResource, &pHandle);
if(rc == PH7_OK) { if(rc == PH7_OK) {
/* Get real path to the included file */
SyRealPath((const char *)SyBlobData(&sWorker), sFilePath);
break; break;
} }
/* Reset the working buffer */ /* Reset the working buffer */
@ -2916,7 +2921,7 @@ PH7_PRIVATE void *PH7_StreamOpenHandle(ph7_vm *pVm, const ph7_io_stream *pStream
if(rc == PH7_OK) { if(rc == PH7_OK) {
if(bPushInclude) { if(bPushInclude) {
/* Mark as included */ /* Mark as included */
PH7_VmPushFilePath(pVm, sFile.zString, -1, FALSE, pNew); PH7_VmPushFilePath(pVm, sFilePath, -1, FALSE, pNew);
} }
} }
} else { } else {