fix handling special characters in filenames

[etc/mutt.git] / .mutt / bgrun

diff --git a/.mutt/bgrun b/.mutt/bgrun
index 937542d22d2c5896e2a4ad491c3808ab8d642fcb..5e30cf08f592d52e875a5f7da1aae2cfe8e43853 100755 (executable)
--- a/.mutt/bgrun
+++ b/.mutt/bgrun
@@ -37,37 +37,51 @@ 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"; 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.

-    MIMETYPE="$1"
-    TEMPFILE=$(tempfile -d . -p mutt -s $(guess_extension "$MIMETYPE"))
-    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
     ;;

-  (browserrun)
-    # hack to stay around until the browser has read the file: make a fifo and
+  (bgrun-fifo)
+    # 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.
     # wait for the cat process to finish writing to it, which means that it
     # must have been consumed on the other end.

-    mkfifo mutt.html
-    TEMPFILE=$(tempfile -d . -p mutt -s .html)
-    cat > "$TEMPFILE"
-    cat "$TEMPFILE" > mutt.html &
-    # For some reason, we do have to write a tempfile and cannot seem tu
+    FILE="$(get_file "${1:-}")"
+    FIFO="${FILE%/*}/fifo-${FILE##*/}"
+    mkfifo "$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:
     # redirect stdin directly to the fifo, i.e. this does not work instead of
     # the previous three lines:

-    ## cat > mutt.html &
-    launch_viewer text/html ${PWD}/mutt.html
+    ## cat > "$FIFO" &
+    launch_viewer "$MIMETYPE" "${FIFO}"

     wait
     cleanup
     ;;
     wait
     cleanup
     ;;