the10thwiz/cc65
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't ignore empty paths when adding the path of a file to the search path

Browse Source 
list.


git-svn-id: svn://svn.cc65.org/cc65/trunk@4674 b7a2c559-68d2-44c3-8de9-860c34a00d81
This commit is contained in:
uz
2010-05-29 21:20:48 +00:00
parent 02f5b5499e
commit 314893619a
1 changed files with 9 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/cc65/input.c
View File

@@ -148,7 +148,7 @@ static AFile* NewAFile (IFile* IF, FILE* F)
* the path search list, and finally return a pointer to the new AFile struct. * the path search list, and finally return a pointer to the new AFile struct.
*/ */
{ {
const char* Filename; StrBuf Path = AUTO_STRBUF_INITIALIZER;
/* Allocate a AFile structure */ /* Allocate a AFile structure */
AFile* AF = (AFile*) xmalloc (sizeof (AFile)); AFile* AF = (AFile*) xmalloc (sizeof (AFile));
@@ -172,7 +172,7 @@ static AFile* NewAFile (IFile* IF, FILE* F)
* if a file has changed in the debugger, we will ignore this problem * if a file has changed in the debugger, we will ignore this problem
* here. * here.
*/ */
struct stat Buf; struct stat Buf;
if (stat (IF->Name, &Buf) != 0) { if (stat (IF->Name, &Buf) != 0) {
/* Error */ /* Error */
Fatal ("Cannot stat `%s': %s", IF->Name, strerror (errno)); Fatal ("Cannot stat `%s': %s", IF->Name, strerror (errno));
@@ -187,24 +187,14 @@ static AFile* NewAFile (IFile* IF, FILE* F)
/* Insert the new structure into the AFile collection */ /* Insert the new structure into the AFile collection */
CollAppend (&AFiles, AF); CollAppend (&AFiles, AF);
/* Get the path of this file. If it is not empty, add it as an extra /* Get the path of this file and add it as an extra search path.
* search path. To avoid file search overhead, we will not add empty * To avoid file search overhead, we will add one path only once.
* paths, since the search path list is initialized with an empty * This is checked by the PushSearchPath function.
* path, so files in the current directory are always found first.
*/ */
Filename = FindName (IF->Name); SB_CopyBuf (&Path, IF->Name, FindName (IF->Name) - IF->Name);
AF->SearchPath = (Filename - IF->Name); /* Actually the length */ SB_Terminate (&Path);
if (AF->SearchPath) { AF->SearchPath = PushSearchPath (UsrIncSearchPath, SB_GetConstBuf (&Path));
/* We have a path, extract and push it to the search path list */ SB_Done (&Path);
StrBuf Path = AUTO_STRBUF_INITIALIZER;
SB_CopyBuf (&Path, IF->Name, AF->SearchPath);
SB_Terminate (&Path);
if (PushSearchPath (UsrIncSearchPath, SB_GetConstBuf (&Path)) == 0) {
/* The path is already there ... */
AF->SearchPath = 0;
}
SB_Done (&Path);
}
/* Return the new struct */ /* Return the new struct */
return AF; return AF;