mirror/aseprite
1
0
Fork 0
mirror of https://github.com/aseprite/aseprite.git synced 2025-03-20 13:21:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix compilation problems in core/file_system.cpp (in Unix like platforms).

Browse Source
This commit is contained in:
David Capello 2010-09-30 16:23:54 -03:00
parent 48d0878c7e
commit c4d04d7bf6
1 changed files with 5 additions and 7 deletions

12
src/core/file_system.cpp

@ -1025,12 +1025,12 @@ static FileItem* get_fileitem_by_path(const base::string& path, bool create_if_n
FileItem* fileitem = new FileItem(NULL);
fileitem->filename = path;
fileitem->displayname = path.filename();
fileitem->displayname = base::get_file_name(path);
fileitem->attrib = attrib;
// get the parent
{
base::string parent_path = remove_backslash_if_needed(path.filepath() / "");
base::string parent_path = remove_backslash_if_needed(base::join_path(base::get_file_path(path), ""));
fileitem->parent = get_fileitem_by_path(parent_path, true);
}
@ -1074,7 +1074,7 @@ static void for_each_child_callback(const char *filename, int attrib, int param)
static base::string remove_backslash_if_needed(const base::string& filename)
{
if (!filename.empty() && base::string::is_separator(filename.back())) {
if (!filename.empty() && base::is_path_separator(*(filename.end()-1))) {
int len = filename.size();
#ifdef HAVE_DRIVES
// if the name is C:\ or something like that, the backslash isn't
@ -1086,9 +1086,7 @@ static base::string remove_backslash_if_needed(const base::string& filename)
if (len == 1)
return filename;
#endif
base::string tmp(filename);
tmp.remove_separator();
return tmp;
return base::remove_path_separator(filename);
}
return filename;
}
@ -1100,7 +1098,7 @@ static base::string get_key_for_filename(const base::string& filename)
#if !defined CASE_SENSITIVE
buf.tolower();
#endif
buf.fix_separators();
buf = base::fix_path_separators(buf);
return buf;
}