[Nmh-commits] [SCM] The nmh Mail Handling System branch, master, updated. ee8a311403280f7aefb1fb727ccbc6a9d98cce89

[Ken Hornstein]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "The nmh Mail Handling System".

The branch, master has been updated
       via  ee8a311403280f7aefb1fb727ccbc6a9d98cce89 (commit)
      from  0334babd3b366359fa8879a07222e615d9d69459 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit/nmh.git/commit/?id=ee8a311403280f7aefb1fb727ccbc6a9d98cce89


commit ee8a311403280f7aefb1fb727ccbc6a9d98cce89
Author: Ken Hornstein <address@hidden>
Date:   Tue Apr 3 13:04:47 2012 -0400

    Fix some bugs in replyfilter.

diff --git a/docs/replyfilter b/docs/replyfilter
index de81f87..8906652 100755
--- a/docs/replyfilter
+++ b/docs/replyfilter
@@ -68,7 +68,13 @@ die "Usage: $0 Content-type content-transfer-encoding 
quote-prefix\n"
                                if $#ARGV != 2;
 
 if ($ARGV[0] ne "") {
-       $content_type = Mail::Field->new('Content-Type', $ARGV[0]);
+       my $ctype = Mail::Field->new('Content-Type', $ARGV[0]);
+       $content_type =  $ctype->type;
+       $charset = $ctype->charset;
+       $boundary = $ctype->boundary;
+} else {
+       $content_type = 'text/plain';
+       $charset = 'us-ascii';
 }
 
 $encoding = $ARGV[1] eq "" ? '7bit' : lc($ARGV[1]);
@@ -85,8 +91,8 @@ binmode(STDOUT, ":encoding($outcharset)");
 # to our format subroutine.
 #
 
-if ($ARGV[0] eq "" || $content_type->type eq 'text/plain') {
-       process_text(\*STDIN, $encoding, $content_type->charset);
+if ($content_type eq 'text/plain') {
+       process_text(\*STDIN, $encoding, $charset);
        exit 0;
 }
 
@@ -98,7 +104,7 @@ if ($ARGV[0] eq "" || $content_type->type eq 'text/plain') {
 # Put markers in the output for other content types.
 #
 
-($type) = (split('/', $content_type->type));
+($type) = (split('/', $content_type));
 
 if ($type eq 'multipart') {
 
@@ -107,9 +113,7 @@ if ($type eq 'multipart') {
        # Eat the MIME prologue (everything up until the first boundary)
        #
 
-       $boundary = $content_type->boundary;
-
-       if ($boundary eq '') {
+       if (! defined $boundary || $boundary eq '') {
                print "No boundary in Content-Type header!\n";
                eat_part(\*STDIN);
                exit 1;
@@ -127,8 +131,7 @@ if ($type eq 'multipart') {
        undef $boundary;
 }
 
-process_part(\*STDIN, $content_type->type, $encoding, $content_type->charset,
-            $boundary);
+process_part(\*STDIN, $content_type, $encoding, $charset, $boundary);
 
 if ($boundary) {
        #

-----------------------------------------------------------------------

Summary of changes:
 docs/replyfilter |   21 ++++++++++++---------
 1 files changed, 12 insertions(+), 9 deletions(-)


hooks/post-receive
-- 
The nmh Mail Handling System