From a7e4ad11210f674d83987955394ad78d70ac9a69 Mon Sep 17 00:00:00 2001 From: Matthieu Rakotojaona Date: Sat, 11 Nov 2023 02:01:19 +0100 Subject: [PATCH 1/4] Attach all files when forwarding in raw mode --- mcom | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/mcom b/mcom index 4e834c6..e62b759 100755 --- a/mcom +++ b/mcom @@ -306,6 +306,19 @@ fi msgid museragent cat "$MBLAZE/headers" 2>/dev/null + if [ -n "$raw" ]; then + prev=$(pwd) + attachdir=$(mktemp -d) + cd $attachdir + trap 'rm -r "$attachdir"' EXIT + + mseq -r "$@" \ + | xargs -I {} mshow -Bx {} \ + | xargs --null realpath \ + | sed '/^$/d; s/^/Attach: /' + cd $prev + fi + printf '\n\n' if [ -z "$raw" ]; then mseq -r "$@" | sed 's:^:#message/rfc822#inline :; s:$:>:' From d39a6a3f9216c2ec19b90c6c69bc4c2bf88db707 Mon Sep 17 00:00:00 2001 From: Matthieu Rakotojaona Date: Fri, 24 Nov 2023 13:54:04 +0100 Subject: [PATCH 2/4] Don't ask for confirmation when deleting draft --- mcom | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mcom b/mcom index e62b759..e52fb9a 100755 --- a/mcom +++ b/mcom @@ -544,7 +544,7 @@ while :; do c=send ;; d|delete) - rm -i "$draft" + rm "$draft" if ! [ -f "$draft" ]; then rm -f "$draftmime" printf '%s\n' "mcom: deleted draft $draft" From 12aed8d5f5bd8482f80ab3c7a800106601a5da03 Mon Sep 17 00:00:00 2001 From: Matthieu Rakotojaona Date: Fri, 9 Feb 2024 13:43:36 +0100 Subject: [PATCH 3/4] Fix attachment handling for multiple files --- mcom | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mcom b/mcom index e52fb9a..4e849aa 100755 --- a/mcom +++ b/mcom @@ -314,7 +314,7 @@ fi mseq -r "$@" \ | xargs -I {} mshow -Bx {} \ - | xargs --null realpath \ + | xargs realpath \ | sed '/^$/d; s/^/Attach: /' cd $prev fi From 74a7957a6df0eefe4f2cb9eaf49aa75679fb04f1 Mon Sep 17 00:00:00 2001 From: Matthieu Rakotojaona Date: Wed, 24 Apr 2024 18:47:46 +0200 Subject: [PATCH 4/4] contrib/mmailto: Fix using longer arguments We put the args to $TERMINAL inside single quotes for terminals that want a single command, and we put arguments extracted from the adress between double quotes to protect from spaces --- contrib/mmailto | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/contrib/mmailto b/contrib/mmailto index 7feabb4..2b38def 100755 --- a/contrib/mmailto +++ b/contrib/mmailto @@ -19,7 +19,7 @@ fi IFS=' ' -exec $TERMINAL -e mcom $( +args=$( awk -v url="$1" ' function decode(s) { @@ -47,7 +47,7 @@ BEGIN { split(fields[i], kv, "=") if (kv[1] != "r") { args[length(args)+1] = "-" kv[1] - args[length(args)+1] = kv[2] + args[length(args)+1] = "\"" kv[2] "\"" } } for (i in args) { @@ -56,3 +56,5 @@ BEGIN { } ' ) + +exec $TERMINAL -e "mcom $args"