github-repos/tinycc
1
0
Fork 0
mirror of https://github.com/mirror/tinycc.git synced 2025-02-04 06:30:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

Simple-minded fix for bug #50847

Browse Source 
bug #50847: #line directive corrupts #include search path
Keep a second copy of the filename, that isn't changed by the #line directive,
and use that on the initial search path for #include files.
This commit is contained in:
Larry Doolittle 2017-04-25 12:32:41 -07:00
parent 7acf9aa862
commit 37999a4fbf
3 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libtcc.c
View File

@ -581,6 +581,7 @@ ST_FUNC void tcc_open_bf(TCCState *s1, const char *filename, int initlen)
bf->buf_end = bf->buffer + initlen;
bf->buf_end[0] = CH_EOB; /* put eob symbol */
pstrcpy(bf->filename, sizeof(bf->filename), filename);
pstrcpy(bf->filename2, sizeof(bf->filename2), filename);
#ifdef _WIN32
normalize_slashes(bf->filename);
#endif

1
tcc.h
View File

@ -546,6 +546,7 @@ typedef struct BufferedFile {
int *ifdef_stack_ptr; /* ifdef_stack value at the start of the file */
int include_next_index; /* next search path */
char filename[1024]; /* filename */
char filename2[1024]; /* filename not modified by # line directive */
unsigned char unget[4];
unsigned char buffer[1]; /* extra size for CH_EOB char */
} BufferedFile;

3
tccpp.c
View File

@ -1792,7 +1792,8 @@ ST_FUNC void preprocess(int is_bof)
/* search in file's dir if "header.h" */
if (c != '\"')
continue;
path = file->filename;
/* https://savannah.nongnu.org/bugs/index.php?50847 */
path = file->filename2;
pstrncpy(buf1, path, tcc_basename(path) - path);
} else {