The subtle way BuildAttachArgs uses quotes and whitespace was missed when

it was taken for use in pollrcvd and faxrcvd.  This makes them both use
it was intended.

Also - fix file_XXX to be files_XXX which is what BuildAttachArgs expects.

diff --git a/util/faxrcvd.sh.in b/util/faxrcvd.sh.in
index 6cd0dbf41f997ce0b2fe5a232e3ea2b78249a494..fe49782ca289ba4ce6580d1ea9fd416230461100 100644 (file)
--- a/util/faxrcvd.sh.in
+++ b/util/faxrcvd.sh.in
@@ -155,10 +155,11 @@ fi
 MailWithFAX ()
 {
     template="etc/templates/$TEMPLATE/faxrcvd-$1.txt"
-    file_1=$FILE;
+    files_1=$FILE;
     filetype_1=TIFF;
     nfiles=1;
-    CreateMailMessage $template `BuildAttachArgs $FILETYPE` \
+    ATTACH_ARGS=`BuildAttachArgs $FILETYPE`
+    eval CreateMailMessage $template $ATTACH_ARGS \
        2>$ERRORSTO | $SENDMAIL -f"$FROMADDR" -oi "$SENDTO"
 
 }

diff --git a/util/pollrcvd.sh.in b/util/pollrcvd.sh.in
index d28854c0596a12eb74122e780ecead4ceb733b50..b8f7c86c92a4da9c91be6f9a16a6870153cbd663 100644 (file)
--- a/util/pollrcvd.sh.in
+++ b/util/pollrcvd.sh.in
@@ -153,10 +153,11 @@ TemplateName ()
 MailWithFAX ()
 {
     template=`TemplateName $1`
-    file_1=$FILE;
+    files_1=$FILE;
     filetype_1=TIFF;
     nfiles=1;
-    CreateMailMessage $template `BuildAttachArgs $FILETYPE` \
+    ATTACH_ARGS=`BuildAttachArgs $FILETYPE`
+    eval CreateMailMessage "$template" $ATTACH_ARGS \
        2>$ERRORSTO | $SENDMAIL -f"$FROMADDR" -oi "$SENDTO"
 
 }