[Bug 371] mimencode vs. uuencode

Make MIME encoding of attached fax configurable via FaxDispatch. Useful
if MIMENCODE utility, whatever is chosen, happens to not have the ability
to generate Base64-encoded text. Thanks Lee!

diff --git a/util/faxrcvd.sh.in b/util/faxrcvd.sh.in
index 8444621019d33992001ec7dccdda0ee5fa44cac4..ac39a6b96bab898fd5c4af1154f81e6e3b646bd5 100644 (file)
--- a/util/faxrcvd.sh.in
+++ b/util/faxrcvd.sh.in
@@ -54,6 +54,7 @@ EOF
 INFO=$SBIN/faxinfo
 FAX2PS=$TIFFBIN/fax2ps
 MIMENCODE=mimencode
+ENCODING=base64
 TIFF2PS=tiff2ps
 PS2PDF=ps2pdf
 TOADDR=FaxMaster
@@ -181,14 +182,14 @@ if [ -f $FILE ]; then
         if [ "$FILETYPE" = "tif" ]; then
             echo "Content-Type: image/tiff; name=\"$FILENAME.tif\""
             echo "Content-Description: FAX document"
-            echo "Content-Transfer-Encoding: base64"
+            echo "Content-Transfer-Encoding: $ENCODING"
             echo "Content-Disposition: attachment; filename=\"$FILENAME.tif\""
             echo ""
             $MIMENCODE $FILE 2>/dev/null
         elif [ "$FILETYPE" = "pdf" ]; then
             echo "Content-Type: application/pdf; name=\"c$COMMID.pdf\""
             echo "Content-Description: FAX document"
-            echo "Content-Transfer-Encoding: base64"
+            echo "Content-Transfer-Encoding: $ENCODING"
             echo "Content-Disposition: attachment; filename=\"c$COMMID.pdf\""
             echo ""
             GW=`$TIFFINFO $FILE | $GREP "Image Width" | \

diff --git a/util/pollrcvd.sh.in b/util/pollrcvd.sh.in
index 4b5926316d1531718b6f595a3f4f49f94f9b9ab4..2fa5800e492eab8d5729d3b263cf628c0c5286b4 100644 (file)
--- a/util/pollrcvd.sh.in
+++ b/util/pollrcvd.sh.in
@@ -55,6 +55,7 @@ EOF
 INFO=$SBIN/faxinfo
 FAX2PS=$TIFFBIN/fax2ps
 MIMENCODE=mimencode
+ENCODING=base64
 TIFF2PS=tiff2ps
 PS2PDF=ps2pdf
 TOADDR=FaxMaster
@@ -167,14 +168,14 @@ if [ -f $FILE ]; then
        if [ "$FILETYPE" = "tif" ]; then
            echo "Content-Type: image/tiff; name=\"$FILENAME.tif\""
            echo "Content-Description: FAX document"
-           echo "Content-Transfer-Encoding: base64"
+           echo "Content-Transfer-Encoding: $ENCODING"
            echo "Content-Disposition: attachment; filename=\"$FILENAME.tif\""
            echo ""
            $MIMENCODE $FILE 2>/dev/null
        elif [ "$FILETYPE" = "pdf" ]; then
            echo "Content-Type: application/pdf; name=\"c$COMMID.pdf\""
            echo "Content-Description: FAX document"
-           echo "Content-Transfer-Encoding: base64"
+           echo "Content-Transfer-Encoding: $ENCODING"
            echo "Content-Disposition: attachment; filename=\"c$COMMID.pdf\""
            echo ""
            GW=`$TIFFINFO $FILE | $GREP "Image Width" | \