- Make sure the file redirections apply to the complete command, even when pipes...

- Also use the fallback encoders when encoders are defined but not executable.

diff --git a/util/common-functions.sh.in b/util/common-functions.sh.in
index 920a0949faaac5548245fdd3ed1fe1e9e7cad83c..9e991f78d82075dc0344bda3d4b920ed05eff1fa 100644 (file)
--- a/util/common-functions.sh.in
+++ b/util/common-functions.sh.in
@@ -192,7 +192,9 @@ mimeEncode()
                # $BASE64ENCODE may contain parameters
                cmd=`programOfCommand $BASE64ENCODE`
                if [ -x "$cmd" ]; then
-                   $BASE64ENCODE < $1 2>$ERRORSTO
+                   ($BASE64ENCODE) < $1 2>$ERRORSTO
+               else
+                   $AWK -f bin/b64-encode.awk < $1 2>$ERRORSTO
                fi
            else
                $AWK -f bin/b64-encode.awk < $1 2>$ERRORSTO
@@ -202,7 +204,9 @@ mimeEncode()
                # $QPENCODE may contain parameters
                cmd=`programOfCommand $QPENCODE`
                if [ -x "$cmd" ]; then
-                   $QPENCODE < $1 2>$ERRORSTO
+                   ($QPENCODE) < $1 2>$ERRORSTO
+               else
+                   $AWK -f bin/qp-encode.awk < $1 2>$ERRORSTO
                fi
            else
                $AWK -f bin/qp-encode.awk < $1 2>$ERRORSTO