alx/mu4e
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

mu-utils-file: use std::filesystem::remove_all

Browse Source 
Instead of the hacky "rm -rf"
This commit is contained in:
Dirk-Jan C. Binnema
2026-03-17 08:59:29 +02:00
committed by Seth Ladygo
parent 3c4b50e7a2
commit 339cf0bd65
1 changed files with 8 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
lib/utils/mu-utils-file.cc
View File

@ -29,6 +29,8 @@
#include <gio/gio.h> #include <gio/gio.h>
#include <gio/gunixinputstream.h> #include <gio/gunixinputstream.h>
#include <filesystem>
#ifdef HAVE_WORDEXP_H #ifdef HAVE_WORDEXP_H
#include <wordexp.h> #include <wordexp.h>
#endif /*HAVE_WORDEXP_H*/ #endif /*HAVE_WORDEXP_H*/
@ -124,22 +126,13 @@ Mu::remove_directory(const std::string& path)
if (!check_dir(path, false, true)) if (!check_dir(path, false, true))
return Err(Error::Code::File, "not a writable directory: {}", path); return Err(Error::Code::File, "not a writable directory: {}", path);
// ugly: g_spawn wants gchar** std::error_code err{};
std::array<char*, 4> argv = { g_find_program_in_path("rm"), const auto n{std::filesystem::remove_all(path, err)};
g_strdup("-r"), g_strdup(path.c_str()), {}}; if (err)
if (!argv[0]) { return Err(Error::Code::File, "failed to remove {}; exit-code={}",
std::for_each(argv.begin(), argv.end(), g_free); path, err.value());
return Err(Error::Code::File, "cannot find 'rm' in path");
}
GError *err{}; mu_debug("removed directory '{}' ({})", path, n);
int status{};
const auto res = g_spawn_sync({}, argv.data(), {}, {}, {}, {}, {}, {}, &status, &err);
std::for_each(argv.begin(), argv.end(), g_free);
if (!res)
return Err(Error::Code::File, &err, "failed to remove {}; exit-code={}", path, status);
mu_debug("removed directory '{}'", path);
return Ok(); return Ok();
} }