* [PATCH 00/11] viewvcs: more fixes
@ 2019-01-30 4:44 7% Eric Wong
2019-01-30 4:44 7% ` [PATCH 01/11] hval: add src_escape for highlight post-processing Eric Wong
0 siblings, 1 reply; 2+ results
From: Eric Wong @ 2019-01-30 4:44 UTC (permalink / raw)
To: meta
Been hammering away with check-www-inbox on git@vger without problems,
so I'll probably deploy this to the non-onion site soon...
And maybe I'll set the non-.onion to use 216dark, too...
Eric Wong (11):
hval: add src_escape for highlight post-processing
t/check-www-inbox: replace IPC::Run with PublicInbox::Spawn
t/check-www-inbox: don't follow mboxes
t/check-www-inbox: disable history
solvergit: do not solve blobs twice
viewvcs: avoid segfault with highlight.pm at shutdown
css/216dark: add comments and tweak highlight colors
solvergit: do not show full path names to "git apply"
solvergit: avoid "Wide character" warnings
solvergit: extract mode from diff headers properly
solvergit: deal with alternative diff prefixes
contrib/css/216dark.css | 14 ++++++------
lib/PublicInbox/Hval.pm | 8 ++++++-
lib/PublicInbox/SolverGit.pm | 18 ++++++++++-----
lib/PublicInbox/UserContent.pm | 14 ++++++------
lib/PublicInbox/ViewVCS.pm | 9 +++++++-
t/check-www-inbox.perl | 42 +++++++++++++++++++++++++++++-----
t/hval.t | 3 +++
7 files changed, 80 insertions(+), 28 deletions(-)
--
EW
^ permalink raw reply [relevance 7%]
* [PATCH 01/11] hval: add src_escape for highlight post-processing
2019-01-30 4:44 7% [PATCH 00/11] viewvcs: more fixes Eric Wong
@ 2019-01-30 4:44 7% ` Eric Wong
0 siblings, 0 replies; 2+ results
From: Eric Wong @ 2019-01-30 4:44 UTC (permalink / raw)
To: meta
We need to post-process "highlight" output to ensure it doesn't
contain odd bytes which cause "wide character" warnings or
require odd glyphs in source form.
---
lib/PublicInbox/Hval.pm | 8 +++++++-
lib/PublicInbox/ViewVCS.pm | 4 +++-
t/hval.t | 3 +++
3 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/lib/PublicInbox/Hval.pm b/lib/PublicInbox/Hval.pm
index 4d70d5e..53810b3 100644
--- a/lib/PublicInbox/Hval.pm
+++ b/lib/PublicInbox/Hval.pm
@@ -9,7 +9,7 @@ use warnings;
use Encode qw(find_encoding);
use PublicInbox::MID qw/mid_clean mid_escape/;
use base qw/Exporter/;
-our @EXPORT_OK = qw/ascii_html obfuscate_addrs to_filename/;
+our @EXPORT_OK = qw/ascii_html obfuscate_addrs to_filename src_escape/;
my $enc_ascii = find_encoding('us-ascii');
@@ -63,6 +63,12 @@ my %xhtml_map = (
$xhtml_map{chr($_)} = sprintf('\\x%02x', $_) for (0..31);
%xhtml_map = (%xhtml_map, %escape_sequence);
+sub src_escape ($) {
+ $_[0] =~ s/\r\n/\n/sg;
+ $_[0] =~ s/([\x7f\x00-\x1f])/$xhtml_map{$1}/sge;
+ $_[0] = $enc_ascii->encode($_[0], Encode::HTMLCREF);
+}
+
sub ascii_html {
my ($s) = @_;
$s =~ s/\r\n/\n/sg; # fixup bad line endings
diff --git a/lib/PublicInbox/ViewVCS.pm b/lib/PublicInbox/ViewVCS.pm
index a8aa0b6..63e503d 100644
--- a/lib/PublicInbox/ViewVCS.pm
+++ b/lib/PublicInbox/ViewVCS.pm
@@ -20,7 +20,7 @@ use Encode qw(find_encoding);
use PublicInbox::SolverGit;
use PublicInbox::WwwStream;
use PublicInbox::Linkify;
-use PublicInbox::Hval qw(ascii_html to_filename);
+use PublicInbox::Hval qw(ascii_html to_filename src_escape);
my $hl = eval {
require PublicInbox::HlMod;
PublicInbox::HlMod->new;
@@ -96,6 +96,8 @@ sub solve_result {
$l->linkify_1($$blob);
my $ok = $hl->do_hl($blob, $path) if $hl;
if ($ok) {
+ $$ok = $enc_utf8->decode($$ok);
+ src_escape($$ok);
$blob = $ok;
} else {
$$blob = ascii_html($$blob);
diff --git a/t/hval.t b/t/hval.t
index a193c29..bfc9a85 100644
--- a/t/hval.t
+++ b/t/hval.t
@@ -43,5 +43,8 @@ is('foo-bar', PublicInbox::Hval::to_filename("foo bar\nanother line\n"),
is('foo.bar', PublicInbox::Hval::to_filename("foo....bar"),
'to_filename squeezes -');
+my $s = "\0\x07\n";
+PublicInbox::Hval::src_escape($s);
+is($s, "\\0\\a\n", 'src_escape works as intended');
done_testing();
--
EW
^ permalink raw reply related [relevance 7%]
Results 1-2 of 2 | reverse | options above
-- pct% links below jump to the message on this page, permalinks otherwise --
2019-01-30 4:44 7% [PATCH 00/11] viewvcs: more fixes Eric Wong
2019-01-30 4:44 7% ` [PATCH 01/11] hval: add src_escape for highlight post-processing Eric Wong
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).