OSO/TinyCC
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

check for absolute include paths

Browse Source 
Suggested by Sandor Zsolt <narkoskatona@yahoo.com>
This commit is contained in:
grischka
2009-04-03 20:54:34 +02:00
parent 29c8e1545a
commit 6c10429aa5
1 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
tcc.c
View File

@ -1078,16 +1078,19 @@ static int strstart(const char *str, const char *val, const char **ptr)
} }
#endif #endif
#ifdef _WIN32
#define IS_PATHSEP(c) (c == '/' || c == '\\')
#define IS_ABSPATH(p) (IS_PATHSEP(p[0]) || (p[0] && p[1] == ':' && IS_PATHSEP(p[2])))
#else
#define IS_PATHSEP(c) (c == '/')
#define IS_ABSPATH(p) IS_PATHSEP(p[0])
#endif
/* extract the basename of a file */ /* extract the basename of a file */
static char *tcc_basename(const char *name) static char *tcc_basename(const char *name)
{ {
char *p = strchr(name, 0); char *p = strchr(name, 0);
while (p > name while (p > name && !IS_PATHSEP(p[-1]))
&& p[-1] != '/'
#ifdef _WIN32
&& p[-1] != '\\'
#endif
)
--p; --p;
return p; return p;
} }
@ -3086,6 +3089,13 @@ static void preprocess(int is_bof)
/* push current file in stack */ /* push current file in stack */
/* XXX: fix current line init */ /* XXX: fix current line init */
*s1->include_stack_ptr++ = file; *s1->include_stack_ptr++ = file;
/* check absolute include path */
if (IS_ABSPATH(buf)) {
f = tcc_open(s1, buf);
if (f)
goto found;
}
if (c == '\"') { if (c == '\"') {
/* first search in current dir if "header.h" */ /* first search in current dir if "header.h" */
size = tcc_basename(file->filename) - file->filename; size = tcc_basename(file->filename) - file->filename;