user/dev discussion of public-inbox itself
 help / color / mirror / code / Atom feed
From: Eric Wong <e@80x24.org>
To: meta@public-inbox.org
Cc: Eric Wong <e@80x24.org>
Subject: [PATCH 3/3] filter: ensure CRs do not show up in lynx conversions
Date: Mon, 15 Sep 2014 21:01:38 +0000	[thread overview]
Message-ID: <1410814898-8628-3-git-send-email-e@80x24.org> (raw)
In-Reply-To: <1410814898-8628-1-git-send-email-e@80x24.org>

Unix line endings are LF-only, so do not introduce or preserve
CRLF line endings when reading from lynx.
---
 lib/PublicInbox/Filter.pm | 1 +
 t/filter.t                | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/PublicInbox/Filter.pm b/lib/PublicInbox/Filter.pm
index e784cde..929a8ff 100644
--- a/lib/PublicInbox/Filter.pm
+++ b/lib/PublicInbox/Filter.pm
@@ -97,6 +97,7 @@ sub dump_html {
 		push @cmd, "-assume_charset=$charset";
 	}
 	if (IPC::Run::run(\@cmd, $body, \$out, \$err)) {
+		$out =~ s/\r\n/\n/sg;
 		$$body = $out;
 	} else {
 		# give them an ugly version:
diff --git a/t/filter.t b/t/filter.t
index e4f6a2b..7a4bdb1 100644
--- a/t/filter.t
+++ b/t/filter.t
@@ -85,13 +85,14 @@ sub count_body_parts {
 			'Content-Type' => 'text/html',
 			Subject => 'HTML only badness',
 		],
-		body => "<html><body>bad body</body></html>\n",
+		body => "<html><body>bad body\r\n</body></html>\n",
 	);
 	is(1, PublicInbox::Filter->run($s), "run was a success");
 	unlike($s->as_string, qr/<html>/, "HTML removed");
 	is("text/plain", $s->header("Content-Type"),
 		"content-type changed");
 	like($s->body, qr/\A\s*bad body\s*\z/, "body");
+	unlike($s->body, qr/\r/, "body has no cr");
 	like($s->header("X-Content-Filtered-By"),
 		qr/PublicInbox::Filter/, "XCFB header added");
 }
-- 
EW


      parent reply	other threads:[~2014-09-15 21:01 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-09-15 21:01 [PATCH 1/3] hval: fixup bad line endings in HTML output Eric Wong
2014-09-15 21:01 ` [PATCH 2/3] index: drop signatures from nested output Eric Wong
2014-09-15 21:01 ` Eric Wong [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://public-inbox.org/README

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1410814898-8628-3-git-send-email-e@80x24.org \
    --to=e@80x24.org \
    --cc=meta@public-inbox.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
Code repositories for project(s) associated with this public inbox

	https://80x24.org/public-inbox.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).