changeset 7171:9bc096bc59d4

[project @ 2007-11-13 18:02:51 by jwe]
author jwe
date Tue, 13 Nov 2007 18:02:52 +0000
parents 9f38c6293317
children e9a590a137d8
files ChangeLog octave-bug.in src/ChangeLog src/DLD-FUNCTIONS/rand.cc
diffstat 4 files changed, 28 insertions(+), 14 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-11-13  Joseph P. Skudlarek  <Jskud@Jskud.com>
+
+	* octave-bug.in: Try mailx, then Mail, then /usr/ucb/mail, then
+	/bin/mail.
+ 
 2007-11-13  John W. Eaton  <jwe@octave.org>
 
 	* configure.in: Only define HAVE_PCRE_H if <pcre.h> has the
--- a/octave-bug.in
+++ b/octave-bug.in
@@ -350,24 +350,29 @@
 
 # Now try to mail it.
 
-    ( /bin/mail $BUGADDR < $TEMP.x ) > /dev/null 2>&1
-    status=$?
+    # indicate that we have not yet sent email successfully
+    status=11
+
     if test $status -ne 0; then
-      ( Mail -s "$SUBJECT" $BUGADDR < $TEMP.x ) > /dev/null 2>&1
+      ( mailx -s "$SUBJECT" $BUGADDR < $TEMP.x ) > /dev/null 2>&1
       status=$?
       if test $status -ne 0; then
-	( /usr/ucb/mail -s "$SUBJECT" $BUGADDR < $TEMP.x ) > /dev/null 2>&1
-	status=$?
-	if test $status -ne 0; then
-	  ( mailx -s "$SUBJECT" $BUGADDR < $TEMP.x ) > /dev/null 2>&1
-	  status=$?
-	fi
+        ( Mail -s "$SUBJECT" $BUGADDR < $TEMP.x ) > /dev/null 2>&1
+        status=$?
+        if test $status -ne 0; then
+          ( /usr/ucb/mail -s "$SUBJECT" $BUGADDR < $TEMP.x ) > /dev/null 2>&1
+          status=$?
+          # make /bin/mail our last resort -- it ignores the subject line
+          if test $status -ne 0; then
+            ( /bin/mail $BUGADDR < $TEMP.x ) > /dev/null 2>&1
+            status=$?
+            if test $status -ne 0; then
+              echo "unable to send mail..."
+            fi
+          fi
+        fi
       fi
     fi
-
-    if test $status -ne 0; then
-      echo "unable to send mail..."
-    fi
   fi
 fi
 
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2007-11-13  Joseph P. Skudlarek  <Jskud@Jskud.com>
+
+	* DLD-FUNCTIONS/rand.cc (Frand): Update URL reference in doc string.
+
 2007-11-12  David Bateman  <dbateman@free.fr>
 
 	* graphics.h.in, graphics.cc (class text): Add the fontangle and
--- a/src/DLD-FUNCTIONS/rand.cc
+++ b/src/DLD-FUNCTIONS/rand.cc
@@ -346,7 +346,7 @@
 ``Mersenne Twister: A 623-dimensionally\n\
 equidistributed uniform pseudorandom number generator'', ACM Trans. on\n\
 Modeling and Computer Simulation Vol. 8, No. 1, January pp.3-30 1998,\n\
-@url{http://www.math.keio.ac.jp/~matumoto/emt.html}).\n\
+@url{http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/emt.html}).\n\
 Do @strong{not} use for cryptography without securely hashing\n\
 several returned values together, otherwise the generator state\n\
 can be learned after reading 624 consecutive values.\n\