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

mu/lib: fix some possible quoting issues

Browse Source
This commit is contained in:
Dirk-Jan C. Binnema
2026-03-07 15:49:44 +02:00
committed by Seth Ladygo
parent 5e9cdc6654
commit 45b9722040
4 changed files with 21 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -370,7 +370,7 @@ expand_path_real(const std::string& str)
int res; int res;
wordexp_t result{}; wordexp_t result{};
res = wordexp(str.c_str(), &result, 0); res = wordexp(str.c_str(), &result, WRDE_NOCMD);
if (res != 0) if (res != 0)
return Err(Error::Code::File, "cannot expand {}; err={}", str, res); return Err(Error::Code::File, "cannot expand {}; err={}", str, res);
else if (auto&n = result.we_wordc; n != 1) { else if (auto&n = result.we_wordc; n != 1) {
@ -395,8 +395,7 @@ Mu::expand_path(const std::string& str)
return res; return res;
// failed... try quoting. // failed... try quoting.
auto qstr{to_string_gchar(g_shell_quote(str.c_str()))}; return expand_path_real(shell_quote(str));
return expand_path_real(qstr);
} }

18
lib/utils/mu-utils.hh
View File

@ -498,7 +498,7 @@ to_string(const T& val)
* *
* @return a string_view * @return a string_view
*/ */
static inline std::string_view inline std::string_view
to_string_view(const std::string& s) to_string_view(const std::string& s)
{ {
return std::string_view{s.data(), s.size()}; return std::string_view{s.data(), s.size()};
@ -511,7 +511,7 @@ to_string_view(const std::string& s)
* *
* @return a std::string, empty if gchar was {} * @return a std::string, empty if gchar was {}
*/ */
static inline std::string inline std::string
to_string_gchar(gchar*&& str) to_string_gchar(gchar*&& str)
{ {
std::string s(str?str:""); std::string s(str?str:"");
@ -525,7 +525,7 @@ to_string_gchar(gchar*&& str)
* *
* @return a std::string, empty if gchar was {} * @return a std::string, empty if gchar was {}
*/ */
static inline std::string inline std::string
to_string_char(char*&& str) to_string_char(char*&& str)
{ {
std::string s(str?str:""); std::string s(str?str:"");
@ -533,6 +533,18 @@ to_string_char(char*&& str)
return s; return s;
} }
/**
* Shell-quote the given string (as per g_shell_quote())
*
* @param str some string
*
* @return quoted string
*/
inline std::string shell_quote(const std::string& str) {
return to_string_gchar(g_shell_quote(str.c_str()));
}
/* /*
* Lexnums are lexicographically sortable string representations of non-negative * Lexnums are lexicographically sortable string representations of non-negative
* integers. Start with 'f' + length of hex-representation number, followed by * integers. Start with 'f' + length of hex-representation number, followed by

3
mu/mu-cmd-find.cc
View File

@ -116,8 +116,7 @@ exec_cmd(const Option<Message>& msg, const OutputInfo& info, const Options& opts
int wait_status{}; int wait_status{};
GError *err{}; GError *err{};
auto cmdline{mu_format("{} {}", opts.find.exec, auto cmdline{mu_format("{} {}", opts.find.exec, shell_quote(msg->path()))};
to_string_gchar(g_shell_quote(msg->path().c_str())))};
if (!g_spawn_command_line_sync(cmdline.c_str(), {}, {}, &wait_status, &err)) if (!g_spawn_command_line_sync(cmdline.c_str(), {}, {}, &wait_status, &err))
return Err(Error::Code::File, &err/*consumed*/, return Err(Error::Code::File, &err/*consumed*/,

7
mu/mu-options.cc
View File

@ -1,5 +1,5 @@
/* /*
** Copyright (C) 2022-2025 Dirk-Jan C. Binnema <djcb@djcbsoftware.nl> ** Copyright (C) 2022-2026 Dirk-Jan C. Binnema <djcb@djcbsoftware.nl>
** **
** This program is free software; you can redistribute it and/or modify it ** This program is free software; you can redistribute it and/or modify it
** under the terms of the GNU General Public License as published by the ** under the terms of the GNU General Public License as published by the
@ -140,8 +140,7 @@ to_enum(const IE& ie, std::string_view name) {
for(auto&& item: ie) for(auto&& item: ie)
if (item.second.first == name) if (item.second.first == name)
return item.first; return item.first;
else return Nothing;
return Nothing;
} }
/** /**
@ -828,7 +827,7 @@ show_manpage(Options& opts, const std::string& name)
"cannot find 'man' program"); "cannot find 'man' program");
GError* err{}; GError* err{};
const auto cmd{mu_format("{} {}", *manprog, name)}; const auto cmd{mu_format("{} {}", *manprog, shell_quote(name))};
// run_command0 doesn't work here. // run_command0 doesn't work here.
auto res = g_spawn_command_line_sync(cmd.c_str(), {}, {}, {}, &err); auto res = g_spawn_command_line_sync(cmd.c_str(), {}, {}, {}, &err);
if (!res) if (!res)