godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[X11] Improving error detection in move_to_trash 

(cherry picked from commit 268d7c7c5b)
This commit is contained in:
Iskustvo 2018-02-14 00:04:11 +01:00 committed by Hein-Pieter van Braam
parent fd033473c7
commit 4bdcee2b9d
2 changed files with 38 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/unix/dir_access_unix.cpp
View File

@ -361,6 +361,7 @@ Error DirAccessUnix::rename(String p_path, String p_new_path) {
return ::rename(p_path.utf8().get_data(), p_new_path.utf8().get_data()) == 0 ? OK : FAILED; return ::rename(p_path.utf8().get_data(), p_new_path.utf8().get_data()) == 0 ? OK : FAILED;
} }
Error DirAccessUnix::remove(String p_path) { Error DirAccessUnix::remove(String p_path) {
if (p_path.is_rel_path()) if (p_path.is_rel_path())

55
platform/x11/os_x11.cpp
View File

@ -32,6 +32,7 @@
#include "drivers/gles3/rasterizer_gles3.h" #include "drivers/gles3/rasterizer_gles3.h"
#include "errno.h" #include "errno.h"
#include "key_mapping_x11.h" #include "key_mapping_x11.h"
#include "os/dir_access.h"
#include "print_string.h" #include "print_string.h"
#include "servers/visual/visual_server_raster.h" #include "servers/visual/visual_server_raster.h"
#include "servers/visual/visual_server_wrap_mt.h" #include "servers/visual/visual_server_wrap_mt.h"
@ -2519,48 +2520,66 @@ static String get_mountpoint(const String &p_path) {
} }
Error OS_X11::move_to_trash(const String &p_path) { Error OS_X11::move_to_trash(const String &p_path) {
String trashcan = ""; String trash_can = "";
String mnt = get_mountpoint(p_path); String mnt = get_mountpoint(p_path);
// If there is a directory "[Mountpoint]/.Trash-[UID]/files", use it as the trash can.
if (mnt != "") { if (mnt != "") {
String path(mnt + "/.Trash-" + itos(getuid()) + "/files"); String path(mnt + "/.Trash-" + itos(getuid()) + "/files");
struct stat s; struct stat s;
if (!stat(path.utf8().get_data(), &s)) { if (!stat(path.utf8().get_data(), &s)) {
trashcan = path; trash_can = path;
} }
} }
if (trashcan == "") { // Otherwise, if ${XDG_DATA_HOME} is defined, use "${XDG_DATA_HOME}/Trash/files" as the trash can.
if (trash_can == "") {
char *dhome = getenv("XDG_DATA_HOME"); char *dhome = getenv("XDG_DATA_HOME");
if (dhome) { if (dhome) {
trashcan = String(dhome) + "/Trash/files"; trash_can = String(dhome) + "/Trash/files";
} }
} }
if (trashcan == "") { // Otherwise, if ${HOME} is defined, use "${HOME}/.local/share/Trash/files" as the trash can.
if (trash_can == "") {
char *home = getenv("HOME"); char *home = getenv("HOME");
if (home) { if (home) {
trashcan = String(home) + "/.local/share/Trash/files"; trash_can = String(home) + "/.local/share/Trash/files";
} }
} }
if (trashcan == "") { // Issue an error if none of the previous locations is appropriate for the trash can.
ERR_PRINTS("move_to_trash: Could not determine trashcan location"); if (trash_can == "") {
ERR_PRINTS("move_to_trash: Could not determine the trash can location");
return FAILED; return FAILED;
} }
List<String> args; // Create needed directories for decided trash can location.
args.push_back("-p"); DirAccess *dir_access = DirAccess::create(DirAccess::ACCESS_FILESYSTEM);
args.push_back(trashcan); Error err = dir_access->make_dir_recursive(trash_can);
Error err = execute("mkdir", args, true); memdelete(dir_access);
if (err == OK) {
List<String> args2; // Issue an error if trash can is not created proprely.
args2.push_back(p_path); if (err != OK) {
args2.push_back(trashcan); ERR_PRINTS("move_to_trash: Could not create the trash can \"" + trash_can + "\"");
err = execute("mv", args2, true); return err;
} }
return err; // The trash can is successfully created, now move the given resource to it.
// Do not use DirAccess:rename() because it can't move files across multiple mountpoints.
List<String> mv_args;
mv_args.push_back(p_path);
mv_args.push_back(trash_can);
int retval;
err = execute("mv", mv_args, true, NULL, NULL, &retval);
// Issue an error if "mv" failed to move the given resource to the trash can.
if (err != OK || retval != 0) {
ERR_PRINTS("move_to_trash: Could not move the resource \"" + p_path + "\" to the trash can \"" + trash_can + "\"");
return FAILED;
}
return OK;
} }
OS::LatinKeyboardVariant OS_X11::get_latin_keyboard_variant() const { OS::LatinKeyboardVariant OS_X11::get_latin_keyboard_variant() const {