asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert "Reworked change_dir to support symlinks"

Browse source
This commit is contained in:
Juan Linietsky 2017-08-21 18:06:01 -03:00 committed by GitHub
parent de261ef380
commit 247c2f7be3
1 changed files with 23 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
drivers/unix/dir_access_unix.cpp
View file

@ -223,37 +223,36 @@ Error DirAccessUnix::make_dir(String p_dir) {
Error DirAccessUnix::change_dir(String p_dir) {
GLOBAL_LOCK_FUNCTION
// make sure current_dir is valid absolute path
if (current_dir == "." || current_dir == "") {
char real_current_dir_name[2048];
getcwd(real_current_dir_name, 2048);
current_dir.parse_utf8(real_current_dir_name);
}
if (p_dir == ".") {
return OK;
}
p_dir = fix_path(p_dir);
String prev_dir = current_dir;
char real_current_dir_name[2048];
getcwd(real_current_dir_name, 2048);
String prev_dir;
if (prev_dir.parse_utf8(real_current_dir_name))
prev_dir = real_current_dir_name; //no utf8, maybe latin?
if (p_dir.is_rel_path()) {
String next_dir = current_dir + "/" + p_dir;
next_dir = next_dir.simplify_path();
current_dir = next_dir;
} else {
current_dir = p_dir;
chdir(current_dir.utf8().get_data()); //ascii since this may be unicode or wathever the host os wants
bool worked = (chdir(p_dir.utf8().get_data()) == 0); // we can only give this utf8
String base = _get_root_path();
if (base != "") {
getcwd(real_current_dir_name, 2048);
String new_dir;
new_dir.parse_utf8(real_current_dir_name);
if (!new_dir.begins_with(base))
worked = false;
}
bool worked = (chdir(current_dir.utf8().get_data()) == 0); // we can only give this utf8
if (!worked) {
current_dir = prev_dir;
return ERR_INVALID_PARAMETER;
if (worked) {
getcwd(real_current_dir_name, 2048);
if (current_dir.parse_utf8(real_current_dir_name))
current_dir = real_current_dir_name; //no utf8, maybe latin?
}
return OK;
chdir(prev_dir.utf8().get_data());
return worked ? OK : ERR_INVALID_PARAMETER;
}
String DirAccessUnix::get_current_dir() {