]> diplodocus.org Git - nmh/commitdiff
projects / nmh / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: abbd645)
More debugging of test-mhfixmsg on Solaris.
authorDavid Levine <levinedl@acm.org>
Sun, 30 Jun 2013 23:03:28 +0000 (18:03 -0500)
committerDavid Levine <levinedl@acm.org>
Sun, 30 Jun 2013 23:03:28 +0000 (18:03 -0500)
test/mhfixmsg/test-mhfixmsg patch | blob | history
uip/mhfixmsg.c patch | blob | history

diff --git a/test/mhfixmsg/test-mhfixmsg b/test/mhfixmsg/test-mhfixmsg
index bc46964fea50cc93b309734e6034d778f1aab32d..cfe21af3f413eb96d47b6fd5ed67bdc156f4d1c7 100755 (executable)
--- a/test/mhfixmsg/test-mhfixmsg
+++ b/test/mhfixmsg/test-mhfixmsg
@@ -64,6 +64,51 @@ case `mhfixmsg -version` in
      failed=`expr ${failed:-0} + 1`;;
 esac
 
+# ????
+cat >`mhpath new` <<'EOF'
+MIME-Version: 1.0
+Content-Type: text/html; charset="ISO-8859-1"
+Content-Transfer-Encoding: quoted-printable
+Date: Thu, 11 Apr 2013 02:47:08 -0700
+To: <me@example.com>
+From: <sender@example.com>
+Subject: body requires binary encoding
+
+<body>
+<table width=3D"325" border=3D"0" cellspacing=3D"0" cellpadding=3D"0">
+<tr><td><font face=3D"Arial, Helvetica, sans-serif" color=3D"#333333" size=
+=3D"2"><strong>Mile</strong></font></td><td height=3D"3">&nbsp;</td><td ali=
+gn=3D"right"><font face=3D"Arial, Helvetica, sans-serif" color=3D"#333333" =
+size=3D"2">$0.00</font></td></tr><tr><td><font face=3D"Arial, Helvetica, sa=
+ns-serif" color=3D"#333333" size=3D"2"><strong>Time</strong></font></td><td=
+ height=3D"3">&nbsp;</td><td align=3D"right"><font face=3D"Arial, Helvetica=
+, sans-serif" color=3D"#333333" size=3D"2">$78.71</font></td></tr><tr><td><=
+font face=3D"Arial, Helvetica, sans-serif" color=3D"#333333" size=3D"2"><st=
+rong>State Tax</strong></font></td><td height=3D"3">&nbsp;</td><td align=3D=
+"right"><font face=3D"Arial, Helvetica, sans-serif" color=3D"#333333" size=
+=3D"2">$5.90</font></td></tr><tr><td><font face=3D"Arial, Helvetica, sans-s=
+erif" color=3D"#333333" size=3D"2"><strong>Vehicle License Fee</strong></fo=
+nt></td><td height=3D"3">&nbsp;</td><td align=3D"right"><font face=3D"Arial=
+, Helvetica, sans-serif" color=3D"#333333" size=3D"2">$1.84</font></td></tr=
+><tr><td><font face=3D"Arial, Helvetica, sans-serif" color=3D"#333333" size=
+=3D"2"><strong>State Txn Tax</strong></font></td><td height=3D"3">&nbsp;</t=
+d><td align=3D"right"><font face=3D"Arial, Helvetica, sans-serif" color=3D"=
+#333333" size=3D"2">$6.00</font></td></tr>
+
+</body>
+</html>
+EOF
+
+if [ $can_reformat_texthtml -eq 1 ]; then
+  #### lynx inserts multiple blank lines, so use uniq to squeeze them.
+  mhfixmsg last -outfile - | uniq >"$actual"
+  check "$expected" "$actual" 'ignore space'
+else
+  cp -p "$MH_TEST_DIR/Mail/inbox/15" "$MH_TEST_DIR/Mail/inbox/15.backup"
+  rm -f "$expected"
+fi
+exit # ????
+
 
 # check that non-MIME messages aren't modified
 # check -outfile
@@ -666,17 +711,11 @@ d><td align=3D"right"><font face=3D"Arial, Helvetica, sans-serif" color=3D"=
 </html>
 EOF
 
-# ???? debug on Solaris
-egrep mhfixmsg ${MH_TEST_DIR}/Mail/mhn.defaults # ????
 if [ $can_reformat_texthtml -eq 1 ]; then
   #### lynx inserts multiple blank lines, so use uniq to squeeze them.
-  # ???? mhfixmsg last -outfile - | uniq >"$actual"
-  # ???? temporarily add -verbose to debug on Solaris
-  mhfixmsg -verbose last -outfile - | uniq >"$actual" # ????
+  mhfixmsg last -outfile - | uniq >"$actual"
   check "$expected" "$actual" 'ignore space'
 else
-  # ???? temporarily added to debug on Solaris
-  echo "can't reformat text/html" # ????
   cp -p "$MH_TEST_DIR/Mail/inbox/15" "$MH_TEST_DIR/Mail/inbox/15.backup"
   rm -f "$expected"
 fi
diff --git a/uip/mhfixmsg.c b/uip/mhfixmsg.c
index 2714024da18810b1b8847cac94ad5eeb7407f0d9..b96cf6b1247a06710cc3e4292bb1d50c9d246bc9 100644 (file)
--- a/uip/mhfixmsg.c
+++ b/uip/mhfixmsg.c
@@ -1559,7 +1559,10 @@ content_encoding (CT ct) {
             size_t line_len = 0;
             int last_char_was_cr = 0;
 
+            fprintf (stderr, "%s:%d; %*s\n", __FILE__, __LINE__, inbytes, buffer); /* ???? */
+
             for (i = 0, cp = buffer; i < inbytes; ++i, ++cp) {
+                fprintf (stderr, "line_len=%d\n", line_len); /* ???? */
                 if (*cp == '\0'  ||  ++line_len > 998  ||
                     (*cp != '\n'  &&  last_char_was_cr)) {
                     encoding = CE_BINARY;
Fork of https://git.savannah.nongnu.org/cgit/nmh.git