From a71b4f5e8da583006007f8e8882c5f2dcc7a7be5 Mon Sep 17 00:00:00 2001 From: "Dirk-Jan C. Binnema" Date: Wed, 2 Aug 2023 23:11:40 +0300 Subject: [PATCH] options: expand option file paths Fixes #2528 --- mu/mu-options.cc | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/mu/mu-options.cc b/mu/mu-options.cc index f96487a6..1fec3cd5 100644 --- a/mu/mu-options.cc +++ b/mu/mu-options.cc @@ -283,7 +283,9 @@ sub_extract(CLI::App& sub, Options& opts) sub.add_option("--target-dir", opts.extract.targetdir, "Target directory for saving") ->type_name("") - ->default_str("")->default_val("."); + ->transform(ExpandPath, "expand path") + ->default_str("") + ->default_val("."); sub.add_flag("--uncooked,-u", opts.extract.uncooked, "Avoid massaging extracted file-names"); // optional; otherwise use standard-input @@ -398,7 +400,8 @@ sub_find(CLI::App& sub, Options& opts) "Clear old links first"); sub.add_option("--linksdir", opts.find.linksdir, "Use bookmarked query") - ->type_name(""); + ->type_name("") + ->transform(ExpandPath, "expand path"); sub.add_option("--summary-len", opts.find.summary_len, "Use up to so many lines for the summary") @@ -445,7 +448,8 @@ sub_init(CLI::App& sub, Options& opts) { sub.add_option("--maildir,-m", opts.init.maildir, "Top of the maildir") - ->type_name(""); + ->type_name("") + ->transform(ExpandPath, "expand path"); sub.add_option("--my-address", opts.init.my_addresses, "Personal e-mail address or regexp") ->type_name("
"); @@ -769,7 +773,8 @@ There is NO WARRANTY, to the extent permitted by law. sub->add_option("--muhome", opts.muhome, "Specify alternative mu directory") ->envname("MUHOME") - ->type_name(""); + ->type_name("") + ->transform(ExpandPath, "expand path"); } /* add scripts (if supported) as semi-subscommands as well */ @@ -858,10 +863,6 @@ test_ids() #ifdef BUILD_TESTS - - - - enum struct TestEnum { A, B, C }; constexpr AssocPairs test_epairs = {{