emacs
/
mu
mirror of https://github.com/djcb/mu.git
1
0
Fork 0
Code Issues Releases Wiki Activity

mu: allow relative message paths in mu commands

This commit is contained in:
Dirk-Jan C. Binnema 2023-04-04 23:24:18 +03:00
parent 6f2c934d72
commit cd23e6015d
4 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/message/mu-message.cc
View File

@ -73,11 +73,13 @@ struct Message::Private {
static void fill_document(Message::Private& priv);
static Result<struct stat>
get_statbuf(const std::string& path)
get_statbuf(const std::string& path, Message::Options opts = Message::Options::None)
{
if (!g_path_is_absolute(path.c_str()))
if (none_of(opts & Message::Options::AllowRelativePath) &&
!g_path_is_absolute(path.c_str()))
return Err(Error::Code::File, "path '%s' is not absolute",
path.c_str());
if (::access(path.c_str(), R_OK) != 0)
return Err(Error::Code::File, "file @ '%s' is not readable",
path.c_str());
@ -97,7 +99,7 @@ get_statbuf(const std::string& path)
Message::Message(const std::string& path, Message::Options opts):
priv_{std::make_unique<Private>(opts)}
{
const auto statbuf{get_statbuf(path)};
const auto statbuf{get_statbuf(path, opts)};
if (!statbuf)
throw statbuf.error();

10
lib/message/mu-message.hh
View File

@ -45,10 +45,12 @@ namespace Mu {
class Message {
public:
enum struct Options {
None = 0, /**< Defaults */
Decrypt = 1 << 0, /**< Attempt to decrypt */
RetrieveKeys = 1 << 1, /**< Auto-retrieve crypto keys (implies network
* access) */
None = 0, /**< Defaults */
Decrypt = 1 << 0, /**< Attempt to decrypt */
RetrieveKeys = 1 << 1, /**< Auto-retrieve crypto keys (implies network
* access) */
AllowRelativePath = 1 << 2, /**< Allow relateive paths for filename
* in make_from_path */
};
/**

7
mu/mu-cmd.cc
View File

@ -156,12 +156,7 @@ handle_msg(const std::string& fname, const Options& opts)
{
using Format = Options::View::Format;
// make absolute.
const auto fpath{to_string_opt_gchar(g_canonicalize_filename(fname.c_str(), NULL))};
if (!fpath)
return Err(Error::Code::File, "invalid file '%s'", fname.c_str());
auto message{Message::make_from_path(*fpath, message_options(opts.view))};
auto message{Message::make_from_path(fname, message_options(opts.view))};
if (!message)
return Err(message.error());

2
mu/mu-cmd.hh
View File

@ -40,7 +40,7 @@ template<typename CmdOpts>
constexpr Message::Options
message_options(const CmdOpts& cmdopts)
{
Message::Options mopts{};
Message::Options mopts{Message::Options::AllowRelativePath};
if (cmdopts.decrypt)
mopts |= Message::Options::Decrypt;