gbdev/rgbds
1
0
Fork 0
mirror of https://github.com/gbdev/rgbds.git synced 2025-11-20 18:22:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Reject including directories

Browse Source
This commit is contained in:
ISSOtm
2020-03-20 01:24:53 +01:00
parent 5bca1172ff
commit ecf44c784c
1 changed files with 23 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/asm/fstack.c
View File

@@ -10,12 +10,15 @@
* FileStack routines * FileStack routines
*/ */
#include <sys/types.h>
#include <sys/stat.h>
#include <errno.h> #include <errno.h>
#include <limits.h> #include <limits.h>
#include <stdint.h> #include <stdint.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <unistd.h>
#include "asm/fstack.h" #include "asm/fstack.h"
#include "asm/lexer.h" #include "asm/lexer.h"
@@ -349,23 +352,34 @@ static void printdep(const char *fileName)
} }
} }
static FILE *getFile(char const *pathname)
{
struct stat statbuf;
if (stat(pathname, &statbuf) != 0)
return NULL;
/* Reject directories */
if (S_ISDIR(statbuf.st_mode))
return NULL;
return fopen(pathname, "rb");
}
FILE *fstk_FindFile(char const *fname, char **incPathUsed) FILE *fstk_FindFile(char const *fname, char **incPathUsed)
{ {
char path[_MAX_PATH];
int32_t i;
FILE *f;
if (fname == NULL) if (fname == NULL)
return NULL; return NULL;
f = fopen(fname, "rb"); char path[_MAX_PATH];
FILE *f = getFile(fname);
if (f != NULL || errno != ENOENT) { if (f) {
printdep(fname); printdep(fname);
return f; return f;
} }
for (i = 0; i < NextIncPath; ++i) { for (size_t i = 0; i < NextIncPath; ++i) {
/* /*
* The function snprintf() does not write more than `size` bytes * The function snprintf() does not write more than `size` bytes
* (including the terminating null byte ('\0')). If the output * (including the terminating null byte ('\0')). If the output
@@ -381,9 +395,8 @@ FILE *fstk_FindFile(char const *fname, char **incPathUsed)
if (fullpathlen >= (int)sizeof(path)) if (fullpathlen >= (int)sizeof(path))
continue; continue;
f = fopen(path, "rb"); f = getFile(path);
if (f) {
if (f != NULL || errno != ENOENT) {
printdep(path); printdep(path);
if (incPathUsed) if (incPathUsed)