{
std::string::size_type p = filename.find_last_of('/');
if(p == std::string::npos)
- return "";
+ p = filename.find_last_of('\\');
+ if(p == std::string::npos)
+ return "./";
return filename.substr(0, p+1);
}
{
std::string::size_type p = filename.find_last_of('/');
if(p == std::string::npos)
+ p = filename.find_last_of('\\');
+ if(p == std::string::npos)
return filename;
return filename.substr(p+1, filename.size()-p-1);
const char* p = filename.c_str();
while(true) {
- while(*p == '/') {
+ while(*p == '/' || *p == '\\') {
p++;
continue;
}
const char* pstart = p;
- while(*p != '/' && *p != 0) {
+ while(*p != '/' && *p != '\\' && *p != 0) {
++p;
}
if(path_stack.empty()) {
log_warning << "Invalid '..' in path '" << filename << "'" << std::endl;
- // push it into the result path so that the users sees his error...
+ // push it into the result path so that the user sees his error...
path_stack.push_back(pathelem);
} else {
path_stack.pop_back();