X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/d0aa081697fcdc51fc24fa268f13a8d130366b36..b91306a7d8552b3314562378931dc9aad5f2a3c2:/docs/contrib/replyfilter

diff --git a/docs/contrib/replyfilter b/docs/contrib/replyfilter
index ed4fe6b2..7f5b4475 100755
--- a/docs/contrib/replyfilter
+++ b/docs/contrib/replyfilter
@@ -68,11 +68,11 @@ $outcharset = 'utf-8';
 $maxcolwidth = 78;
 
 #
-# Out HTML converter program & arguments
+# Out HTML converter program & arguments. charset will be appended
 #
 
 @htmlconv = ('w3m', '-dump', '-cols', $maxcolwidth - 2, '-T', 'text/html',
-	     '-O', $outcharset);
+	     '-O', $outcharset, '-I');
 
 
 die "Usage: $0 Content-type content-transfer-encoding quote-prefix\n"
@@ -400,7 +400,8 @@ sub process_html (*$$;$)
 		# Exec our converter
 		#
 
-		exec (@htmlconv) ||
+		my @conv = (@htmlconv, $charset);
+		exec (@conv) ||
 				die "Unable to exec $filterprogram: $!\n";
 	} else {
 		die "Fork for $htmlconv[0] failed: $!\n";
@@ -535,7 +536,7 @@ sub process_multipart ($$$)
 			$charset = 'us-ascii';
 		}
 
-		$encoding = defined $cte ? $cte->param('_') : '7bit';
+		$encoding = defined $cte ? lc($cte->param('_')) : '7bit';
 		$name = defined $cdispo ? $cdispo->param('filename') : undef;
 
                 #