Bug 658: fix redirection of stderr in mail generation scripts

diff --git a/CHANGES b/CHANGES
index 986b00d8db344fd40c31a9bbcc4fe758c4e4ff82..a7b301b8a3a53a356fbfe5877240f72589a89fcb 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,7 @@
 
 Changelog for HylaFAX
 
+* fix some dysfunctional mail redirects (30 May 2005)
 * don't save null-data pages (26 May 2005)
 * Add support for OpenServer 6 (24 May 2005)
 * update config.guess and config.sub to current versions (24 May 2005)

diff --git a/util/faxrcvd.sh.in b/util/faxrcvd.sh.in
index ceca5e5503996e55a1438ed0ac483e11dc15c4cf..83a2491f3d94c35022adf2bd33de481481f43206 100644 (file)
--- a/util/faxrcvd.sh.in
+++ b/util/faxrcvd.sh.in
@@ -183,7 +183,7 @@ if [ -f $FILE ]; then
            echo ""
            echo "The facsimile was automatically dispatched to: $SENDTO." 
        fi
-       ) | 2>&1 $SENDMAIL -f$FROMADDR -oi $TOADDR
+       ) 2>$ERRORSTO | $SENDMAIL -f$FROMADDR -oi $TOADDR
     fi
     if [ -n "$SENDTO" ]; then
        (MIMEBOUNDARY="NextPart$$"
@@ -248,7 +248,7 @@ if [ -f $FILE ]; then
         fi
         echo ""
         echo "--$MIMEBOUNDARY--"
-       ) | 2>&1 $SENDMAIL -f$FROMADDR -oi $SENDTO
+       ) 2>$ERRORSTO | $SENDMAIL -f$FROMADDR -oi $SENDTO
     fi
 else
     #
@@ -273,5 +273,5 @@ else
      else
        echo "    No transcript available."
      fi
-    ) | 2>&1 $SENDMAIL -f$FROMADDR -oi $TOADDR
+    ) 2>$ERRORSTO | $SENDMAIL -f$FROMADDR -oi $TOADDR
 fi

diff --git a/util/notify.sh.in b/util/notify.sh.in
index c943bf83e1634f6023c241fb93466d40b7e8f66a..c7f9590046677b29036a88d7978e4613bbafaedf 100644 (file)
--- a/util/notify.sh.in
+++ b/util/notify.sh.in
@@ -824,7 +824,7 @@ fi
 # put out a terminating MIME boundary
 echo ""
 echo "--$MIMEBOUNDARY--"
-) | 2>&1 $SENDMAIL -f$FROMADDR -oi -t
+) 2>$ERRORSTO | $SENDMAIL -f$FROMADDR -oi -t
 
 if [ "$NOTIFY_FAXMASTER" = "yes" ]; then
     (
@@ -844,5 +844,5 @@ if [ "$NOTIFY_FAXMASTER" = "yes" ]; then
             fi
             echo "."
         fi     
-    ) | 2>&1 $SENDMAIL -f$FROMADDR -oi -t
+    ) 2>$ERRORSTO | $SENDMAIL -f$FROMADDR -oi -t
 fi

diff --git a/util/pollrcvd.sh.in b/util/pollrcvd.sh.in
index 3ac5c3bc6f2e8ace0695743fb28f242d035f8f95..6f64b28fefd158f83e9687813b9e64967690a9a1 100644 (file)
--- a/util/pollrcvd.sh.in
+++ b/util/pollrcvd.sh.in
@@ -163,7 +163,7 @@ if [ -f $FILE ]; then
            echo ""
            echo "The facsimile was polled by and delivered to: $MAILADDR."
        fi
-       ) | 2>&1 $SENDMAIL -ffax -oi $TOADDR
+       ) 2>$ERRORSTO | $SENDMAIL -ffax -oi $TOADDR
     fi
     if [ -n "$MAILADDR" ]; then
        (MIMEBOUNDARY="NextPart$$"
@@ -228,7 +228,7 @@ if [ -f $FILE ]; then
        fi
         echo ""
         echo "--$MIMEBOUNDARY--"
-       ) | 2>&1 $SENDMAIL -ffax -oi $MAILADDR
+       ) 2>$ERRORSTO | $SENDMAIL -ffax -oi $MAILADDR
     fi
 else
     #
@@ -253,5 +253,5 @@ else
      else
        echo "    No transcript available."
      fi
-    ) | 2>&1 $SENDMAIL -ffax -oi $TOADDR
+    ) 2>$ERRORSTO | $SENDMAIL -ffax -oi $TOADDR
 fi

diff --git a/util/wedged.sh.in b/util/wedged.sh.in
index 1be3148ac45e8333d0b1cef3ad2dcaa7e819a2fe..338c8ad65b0507450a94b16a573c2954af55b5b3 100644 (file)
--- a/util/wedged.sh.in
+++ b/util/wedged.sh.in
@@ -53,6 +53,16 @@ EOF
 }
 . etc/setup.cache
 
+#
+# Redirect errors to a tty, if possible, rather than
+# dev-nulling them or allowing them to creep into
+# the mail.
+#
+if $TTYCMD >/dev/null 2>&1; then
+    ERRORSTO=`$TTYCMD`
+else
+    ERRORSTO=/dev/null
+fi   
 #
 # Command line params
 #
@@ -199,7 +209,7 @@ EOF
        fi
     fi
 
-    ) | 2>&1 $SENDMAIL -f$FROMADDR -oi $TOADDR
+    ) 2>$ERRORSTO | $SENDMAIL -f$FROMADDR -oi $TOADDR
 fi
 
 exit 0