X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FIMAP.pm;h=37317948490234f0c9ce2dc75f5bacc4541501ea;hb=5198c976ce8b1954f0f76a0da152cc434411f147;hp=2be1b763f30a89f12e84a8c1fa0339026cf3937d;hpb=60d262483a4d6ddf295f5124aed3672866795ee5;p=public-inbox.git

diff --git a/lib/PublicInbox/IMAP.pm b/lib/PublicInbox/IMAP.pm
index 2be1b763..37317948 100644
--- a/lib/PublicInbox/IMAP.pm
+++ b/lib/PublicInbox/IMAP.pm
@@ -426,8 +426,10 @@ sub _esc ($) {
 	if (!defined($v)) {
 		'NIL';
 	} elsif ($v =~ /[{"\r\n%*\\\[]/) { # literal string
+		utf8::encode($v);
 		'{' . length($v) . "}\r\n" . $v;
 	} else { # quoted string
+		utf8::encode($v);
 		qq{"$v"}
 	}
 }
@@ -1005,7 +1007,7 @@ sub fetch_compile ($) {
 	# stabilize partial order for consistency and ease-of-debugging:
 	if (scalar keys %partial) {
 		$need |= NEED_BLOB;
-		$r[2] = [ map { [ $_, @{$partial{$_}} ] } sort keys %partial ];
+		@{$r[2]} = map { [ $_, @{$partial{$_}} ] } sort keys %partial;
 	}
 
 	push @op, $OP_EML_NEW if ($need & (EML_HDR|EML_BDY));
@@ -1028,7 +1030,7 @@ sub fetch_compile ($) {
 
 	# r[1] = [ $key1, $cb1, $key2, $cb2, ... ]
 	use sort 'stable'; # makes output more consistent
-	$r[1] = [ map { ($_->[2], $_->[1]) } sort { $a->[0] <=> $b->[0] } @op ];
+	@{$r[1]} = map { ($_->[2], $_->[1]) } sort { $a->[0] <=> $b->[0] } @op;
 	@r;
 }
 
@@ -1165,17 +1167,11 @@ sub process_line ($$) {
 	my $err = $@;
 	if ($err && $self->{sock}) {
 		$l =~ s/\r?\n//s;
-		err($self, 'error from: %s (%s)', $l, $err);
+		warn("error from: $l ($err)\n");
 		$tag //= '*';
-		$res = "$tag BAD program fault - command not performed\r\n";
+		$res = \"$tag BAD program fault - command not performed\r\n";
 	}
-	return 0 unless defined $res;
-	$self->write($res);
-}
-
-sub err ($$;@) {
-	my ($self, $fmt, @args) = @_;
-	printf { $self->{imapd}->{err} } $fmt."\n", @args;
+	defined($res) ? $self->write($res) : 0;
 }
 
 sub out ($$;@) {