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

+ fix for MSVC2010

This commit is contained in:
kelson42 2013-05-06 21:26:31 +02:00
parent ea3f698d6f
commit c67bbf3922
1 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/common/pathTools.cpp
View File

@ -55,12 +55,23 @@ string computeAbsolutePath(const string path, const string relativePath) {
if (path.empty()) { if (path.empty()) {
char *path=NULL; char *path=NULL;
size_t size = 0; size_t size = 0;
#ifdef _WIN32
path = _getcwd(path,size);
#else
path = getcwd(path,size); path = getcwd(path,size);
#endif
absolutePath = string(path) + separator; absolutePath = string(path) + separator;
} else { } else {
absolutePath = path[path.length() - 1] == separator[0] ? path : path + separator; absolutePath = path[path.length() - 1] == separator[0] ? path : path + separator;
} }
#if _WIN32
char *cRelativePath = _strdup(relativePath.c_str());
#else
char *cRelativePath = strdup(relativePath.c_str()); char *cRelativePath = strdup(relativePath.c_str());
#endif
char *token = strtok(cRelativePath, "/"); char *token = strtok(cRelativePath, "/");
while (token != NULL) { while (token != NULL) {
@ -119,8 +130,14 @@ string getLastPathElement(const string &path) {
} }
unsigned int getFileSize(const string &path) { unsigned int getFileSize(const string &path) {
#ifdef _WIN32
struct _stat filestatus;
_stat(path.c_str(), &filestatus);
#else
struct stat filestatus; struct stat filestatus;
stat(path.c_str(), &filestatus); stat(path.c_str(), &filestatus);
#endif
return filestatus.st_size / 1024; return filestatus.st_size / 1024;
} }