From 334989f146fe1381d7d1e7a167d4fc319f735ba3 Mon Sep 17 00:00:00 2001 From: Thierry Crozat Date: Sun, 11 Mar 2012 13:02:54 +0000 Subject: DEVTOOLS: Fix parsing of codepage file path When the path does not contains a path separator (/ or \) the first character of charset was skipped. --- devtools/create_translations/cp_parser.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/devtools/create_translations/cp_parser.cpp b/devtools/create_translations/cp_parser.cpp index a4202bf153..f5e4c9d6bb 100644 --- a/devtools/create_translations/cp_parser.cpp +++ b/devtools/create_translations/cp_parser.cpp @@ -42,9 +42,11 @@ Codepage *parseCodepageMapping(const std::string &filename) { size_t start = filename.find_last_of("/\\"); if (start == std::string::npos) start = 0; + else + ++start; // Strip off the filename extension const size_t pos = filename.find_last_of('.'); - const std::string charset(filename.substr(start + 1, pos != std::string::npos ? (pos - start - 1) : std::string::npos)); + const std::string charset(filename.substr(start, pos != std::string::npos ? (pos - start) : std::string::npos)); std::ifstream in(filename.c_str()); if (!in) { -- cgit v1.2.3