smallsolar
/
libkiwix
mirror of https://github.com/kiwix/libkiwix.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed compilation on OSX [broken long ago by attempting to support OSX10.5]

This commit is contained in:
renaud gaudin 2013-05-01 15:29:21 +00:00
parent 8fcd9583c4
commit ea3f698d6f
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/common/pathTools.cpp
View File

@ -62,7 +62,7 @@ string computeAbsolutePath(const string path, const string relativePath) {
}
char *cRelativePath = strdup(relativePath.c_str());
char *token = strtok(cRelativePath, "/");
while (token != NULL) {
if (string(token) == "..") {
absolutePath = removeLastPathElement(absolutePath, true, false);
@ -76,7 +76,7 @@ string computeAbsolutePath(const string path, const string relativePath) {
token = strtok(NULL, "/");
}
}
return absolutePath;
}
@ -86,7 +86,7 @@ string removeLastPathElement(const string path, const bool removePreSeparator, c
#else
string separator = "/";
#endif
string newPath = path;
size_t offset = newPath.find_last_of(separator);
if (removePreSeparator && offset != newPath.find_first_of(separator) && offset == newPath.length()-1) {
@ -117,7 +117,7 @@ string getLastPathElement(const string &path) {
return path.substr(path.find_last_of(separator) + 1);
}
unsigned int getFileSize(const string &path) {
struct stat filestatus;
stat(path.c_str(), &filestatus);
@ -158,7 +158,7 @@ bool copyFile(const string &sourcePath, const string &destPath) {
cerr << e.what() << endl;
return false;
}
return true;
}
@ -180,7 +180,7 @@ string getExecutablePath() {
bool writeTextFile(const string &path, const string &content) {
std::ofstream file;
file.open(path);
file.open(path.c_str());
file << content;
file.close();
return true;