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

expand_path: better handle paths with spaces 

I.e., work around surprising behavior of wordexp

Fixes #2566.
This commit is contained in:
Dirk-Jan C. Binnema 2023-10-07 00:16:51 +03:00
parent 2c4c3d8d7c
commit fcd89039eb
1 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -352,18 +352,21 @@ Mu::play (const std::string& path)
Result<std::string>
Mu::expand_path(const std::string& str)
expand_path_real(const std::string& str)
{
#ifndef HAVE_WORDEXP_H
return Ok(std::string{str});
#else
int res;
wordexp_t result;
memset(&result, 0, sizeof(result));
wordexp_t result{};
res = wordexp(str.c_str(), &result, 0);
if (res != 0 || result.we_wordc == 0)
return Err(Error::Code::File, "cannot expand '%s'; err=%d", str.c_str(), res);
if (res != 0)
return Err(Error::Code::File, "cannot expand {}; err={}", str, res);
else if (auto&n = result.we_wordc; n != 1) {
wordfree(&result);
return Err(Error::Code::File, "expected 1 expansions, but got {} for {}", n, str);
}
std::string expanded{result.we_wordv[0]};
wordfree(&result);
@ -374,6 +377,18 @@ Mu::expand_path(const std::string& str)
}
Result<std::string>
Mu::expand_path(const std::string& str)
{
if (auto&& res{expand_path_real(str)}; res)
return res;
// failed... try quoting.
auto qstr{to_string_gchar(g_shell_quote(str.c_str()))};
return expand_path_real(qstr);
}
#ifdef BUILD_TESTS