walkero
/
cppcheck
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Fixed #2131 (Preprocessor: incorrect include file loading)

This commit is contained in:
Daniel Marjamäki 2010-11-14 08:35:32 +01:00
parent 6a06970e1b
commit 71ea6213d0
2 changed files with 23 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
lib/preprocessor.cpp
View File

@ -1472,17 +1472,12 @@ static int tolowerWrapper(int c)
}
void Preprocessor::handleIncludes(std::string &code, const std::string &filePath, const std::list<std::string> &includePaths)
void Preprocessor::handleIncludes(std::string &code,
const std::string &filePath,
const std::list<std::string> &includePaths,
std::set<std::string> handledFiles)
{
std::list<std::string> paths;
std::string path;
path = filePath;
path.erase(1 + path.find_last_of("\\/"));
paths.push_back(path);
std::string::size_type pos = 0;
std::string::size_type endfilePos = 0;
std::set<std::string> handledFiles;
endfilePos = pos;
while ((pos = code.find("#include", pos)) != std::string::npos)
{
// Accept only includes that are at the start of a line
@ -1492,15 +1487,6 @@ void Preprocessor::handleIncludes(std::string &code, const std::string &filePath
continue;
}
// If endfile is encountered, we have moved to a next file in our stack,
// so remove last path in our list.
while ((endfilePos = code.find("\n#endfile", endfilePos)) != std::string::npos && endfilePos < pos)
{
paths.pop_back();
endfilePos += 9; // size of #endfile
}
endfilePos = pos;
std::string::size_type end = code.find("\n", pos);
std::string filename = code.substr(pos, end - pos);
@ -1534,11 +1520,17 @@ void Preprocessor::handleIncludes(std::string &code, const std::string &filePath
if (headerType == UserHeader && !fileOpened)
{
fin.open((paths.back() + filename).c_str());
if (fin.is_open())
if (filePath.find_first_of("\\/") != std::string::npos)
{
filename = paths.back() + filename;
fileOpened = true;
std::string path(filePath);
path.erase(1 + path.find_last_of("\\/"));
fin.open((path + filename).c_str());
if (fin.is_open())
{
filename = path + filename;
fileOpened = true;
}
}
}
@ -1571,12 +1563,10 @@ void Preprocessor::handleIncludes(std::string &code, const std::string &filePath
// Remove space characters that are after or before new line character
processedFile = removeSpaceNearNL(processedFile);
handleIncludes(processedFile, filename, includePaths, handledFiles);
processedFile = "#file \"" + filename + "\"\n" + processedFile + "\n#endfile";
code.insert(pos, processedFile);
path = filename;
path.erase(1 + path.find_last_of("\\/"));
paths.push_back(path);
pos += processedFile.size();
}
else if (!fileOpened)
{

8
lib/preprocessor.h
View File

@ -25,6 +25,7 @@
#include <istream>
#include <string>
#include <list>
#include <set>
class ErrorLogger;
class Settings;
@ -208,9 +209,14 @@ private:
* There must be a path separator at the end. Default parameter is empty list.
* Note that if path from given filename is also extracted and that is used as
* a last include path if include file was not found from earlier paths.
* @param handledFiles used in the recursive handling. Should be empty unless
* a recursive call is made.
* @return modified source code
*/
void handleIncludes(std::string &code, const std::string &filePath, const std::list<std::string> &includePaths);
void handleIncludes(std::string &code,
const std::string &filePath,
const std::list<std::string> &includePaths,
std::set<std::string> handledFiles = std::set<std::string>());
Settings *_settings;
ErrorLogger *_errorLogger;