Zengtudor/ccls
1
0
Fork 0
mirror of https://github.com/MaskRay/ccls.git synced 2025-02-16 21:58:08 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix appveyor

Browse Source
This commit is contained in:
Chao Shen 2018-01-03 20:38:01 +08:00 committed by Jacob Dufault
parent 10c55d9534
commit d9b9e5e227
2 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/platform_posix.cc
View File

@ -139,8 +139,9 @@ std::string GetExecutablePath() {
return std::string(path); return std::string(path);
#else #else
char buffer[PATH_MAX] = {0}; char buffer[PATH_MAX] = {0};
readlink("/proc/self/exe", buffer, PATH_MAX); if(-1 == readlink("/proc/self/exe", buffer, PATH_MAX))
return std::string(buffer); return "";
return buffer;
#endif #endif
} }

16
src/utils.cc
View File

@ -14,6 +14,7 @@
#include <iostream> #include <iostream>
#include <locale> #include <locale>
#include <sstream> #include <sstream>
#include <string>
#include <unordered_map> #include <unordered_map>
#if !defined(__APPLE__) #if !defined(__APPLE__)
@ -490,6 +491,13 @@ std::string GetDefaultResourceDirectory() {
std::string resource_directory = std::string resource_directory =
std::string(ENSURE_STRING_MACRO_ARGUMENT(DEFAULT_RESOURCE_DIRECTORY)); std::string(ENSURE_STRING_MACRO_ARGUMENT(DEFAULT_RESOURCE_DIRECTORY));
// Remove double quoted resource dir if it was passed with quotes
// by the build system.
if (resource_directory.size() >= 2 && resource_directory[0] == '"' &&
resource_directory[resource_directory.size() - 1] == '"') {
resource_directory =
resource_directory.substr(1, resource_directory.size() - 2);
}
if (resource_directory.find("..") != std::string::npos) { if (resource_directory.find("..") != std::string::npos) {
std::string executable_path = GetExecutablePath(); std::string executable_path = GetExecutablePath();
size_t pos = executable_path.find_last_of('/'); size_t pos = executable_path.find_last_of('/');
@ -499,7 +507,11 @@ std::string GetDefaultResourceDirectory() {
result = resource_directory; result = resource_directory;
} }
return NormalizePath(result); result = NormalizePath(result);
#if defined(_WIN32)
std::replace(result.begin(), result.end(), '/', '\\');
#endif
return result;
} }
std::string UpdateToRnNewlines(std::string output) { std::string UpdateToRnNewlines(std::string output) {
@ -585,4 +597,4 @@ TEST_SUITE("Update \\n to \\r\\n") {
REQUIRE(UpdateToRnNewlines("f1\nfo2\nfoo3") == "f1\r\nfo2\r\nfoo3"); REQUIRE(UpdateToRnNewlines("f1\nfo2\nfoo3") == "f1\r\nfo2\r\nfoo3");
REQUIRE(UpdateToRnNewlines("f1\r\nfo2\r\nfoo3") == "f1\r\nfo2\r\nfoo3"); REQUIRE(UpdateToRnNewlines("f1\r\nfo2\r\nfoo3") == "f1\r\nfo2\r\nfoo3");
} }
} }