]> git.madduck.net Git - etc/mutt.git/commitdiff

madduck's git repository

Every one of the projects in this repository is available at the canonical URL git://git.madduck.net/madduck/pub/<projectpath> — see each project's metadata for the exact URL.

All patches and comments are welcome. Please squash your changes to logical commits before using git-format-patch and git-send-email to patches@git.madduck.net. If you'd read over the Git project's submission guidelines and adhered to them, I'd be especially grateful.

SSH access, as well as push access can be individually arranged.

If you use my repositories frequently, consider adding the following snippet to ~/.gitconfig and using the third clone URL listed for each project:

[url "git://git.madduck.net/madduck/"]
  insteadOf = madduck:

improved handling of attachments with spaces in filenames
authormartin f. krafft <madduck@madduck.net>
Wed, 19 Dec 2018 11:42:23 +0000 (12:42 +0100)
committermartin f. krafft <madduck@madduck.net>
Wed, 19 Dec 2018 11:42:23 +0000 (12:42 +0100)
.mutt/bgrun
.mutt/mailcap.backgrounding

index 6e1663036baed216a6015286f61d3903f98ee80a..4dcd3e21cf8280a3719f8315d8657220dc1ef4c8 100755 (executable)
@@ -37,21 +37,34 @@ launch_viewer() {
   run-mailcap --action=view "$1":"$2" > output.stdout 2> output.stderr
 }
 
   run-mailcap --action=view "$1":"$2" > output.stdout 2> output.stderr
 }
 
-MIMETYPE="$1"
-TEMPFILE=$(tempfile -d . -p mutt -s $(guess_extension "$MIMETYPE"))
+MIMETYPE="$1"; shift
+
+get_file() {
+  local t
+  if [ -z "$1" ]; then
+    t=$(tempfile -d . -p mutt -s $(guess_extension "$MIMETYPE"))
+    cat > "$t"
+    echo "$t"
+  else
+    t="$(echo ${1##*/} | sed -re 's![^[:alnum:],.:@%^+=_-]!_!gi')"
+    cp "$1" "$t"
+    echo "$t"
+  fi
+}
 
 case "$SELF" in
   (bgrun)
     # make a copy of the file, then launch a shell process in the background
     # to divert to run-mailcap, after which the temporary directory gets
     # cleaned up.
 
 case "$SELF" in
   (bgrun)
     # make a copy of the file, then launch a shell process in the background
     # to divert to run-mailcap, after which the temporary directory gets
     # cleaned up.
-    cat > "$TEMPFILE"
+    FILE="$(get_file "${1:-}")"
     (
     (
-    launch_viewer "$MIMETYPE" "$TEMPFILE"
+      launch_viewer "$MIMETYPE" "$FILE"
       if [ -s "$TMPDIR/output.stdout" ] || [ -s "$TMPDIR/output.stderr" ]; then
         notify $TMPDIR/output.stdout $TMPDIR/output.stderr \
           "Output from mutt/$SELF on $BASENAME"
       fi
       if [ -s "$TMPDIR/output.stdout" ] || [ -s "$TMPDIR/output.stderr" ]; then
         notify $TMPDIR/output.stdout $TMPDIR/output.stderr \
           "Output from mutt/$SELF on $BASENAME"
       fi
+      sleep 1
       cleanup
     ) &
     trap - 1 2 3 4 5 6 7 8 10 11 12 13 14 15
       cleanup
     ) &
     trap - 1 2 3 4 5 6 7 8 10 11 12 13 14 15
@@ -60,10 +73,10 @@ case "$SELF" in
     # hack to stay around until the viewer has read the file: make a fifo and
     # wait for the cat process to finish writing to it, which means that it
     # must have been consumed on the other end.
     # hack to stay around until the viewer has read the file: make a fifo and
     # wait for the cat process to finish writing to it, which means that it
     # must have been consumed on the other end.
-    cat > "$TEMPFILE"
-    FIFO="${TEMPFILE%/*}/fifo-${TEMPFILE##*/}"
+    FILE="$(get_file "${1:-}")"
+    FIFO="${FILE%/*}/fifo-${FILE##*/}"
     mkfifo "$FIFO"
     mkfifo "$FIFO"
-    cat "$TEMPFILE" > "$FIFO" &
+    cat "$FILE" > "$FIFO" &
     # For some reason, we do have to write a tempfile and cannot seem to
     # redirect stdin directly to the fifo, i.e. this does not work instead of
     # the previous three lines:
     # For some reason, we do have to write a tempfile and cannot seem to
     # redirect stdin directly to the fifo, i.e. this does not work instead of
     # the previous three lines:
index 3e12f1816d77bc55df21605fc458473b37689ec6..c7fc895ac1a918cd3386bf87c3f4756668f2968a 100644 (file)
@@ -2,6 +2,6 @@
 # Mutt mailcap for backgrounding 
 
 text/html; ~/.mutt/bgrun-fifo %t; description=Open file in browser via FIFO
 # Mutt mailcap for backgrounding 
 
 text/html; ~/.mutt/bgrun-fifo %t; description=Open file in browser via FIFO
-application/*; ~/.mutt/bgrun %t; description=Backgrounded run of run-mailcap
-image/*; ~/.mutt/bgrun %t; description=Backgrounded run of run-mailcap
+application/*; ~/.mutt/bgrun %t %s; description=Backgrounded run of run-mailcap
+image/*; ~/.mutt/bgrun %t %s; description=Backgrounded run of run-mailcap
 #multipart/related; ~/.mutt/viewmailattachments; description=Backgrounded loading of HTML message with related parts
 #multipart/related; ~/.mutt/viewmailattachments; description=Backgrounded loading of HTML message with related parts