From 54d1490c895b580907e79289684548e794d0546a Mon Sep 17 00:00:00 2001 From: Sebastian Date: Mon, 26 Feb 2018 13:51:02 +0100 Subject: [PATCH] platform.cpp: Fix that platform files on Windows are not found (#1096) * platform.cpp: Fix that platform files on Windows are not found I suggested this change here: https://trac.cppcheck.net/ticket/8242#comment:7 * Use fromNativeSeparators() and only search for forwardslash --- lib/platform.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/platform.cpp b/lib/platform.cpp index 33dc1a38e..3722142e9 100644 --- a/lib/platform.cpp +++ b/lib/platform.cpp @@ -161,7 +161,7 @@ bool cppcheck::Platform::platformFile(const char exename[], const std::string &f if (doc.LoadFile(filename.c_str()) != tinyxml2::XML_SUCCESS) { std::vector filenames; filenames.push_back(filename + ".xml"); - if (exename && strchr(exename, '/')) { + if (exename && (std::string::npos != Path::fromNativeSeparators(exename).find('/'))) { filenames.push_back(Path::getPathFromFilename(Path::fromNativeSeparators(exename)) + "platforms/" + filename); filenames.push_back(Path::getPathFromFilename(Path::fromNativeSeparators(exename)) + "platforms/" + filename + ".xml"); }