diff options
Diffstat (limited to 'lib/PublicInbox')
-rw-r--r-- | lib/PublicInbox/IMAP.pm | 23 | ||||
-rw-r--r-- | lib/PublicInbox/IMAPsearchqp.pm | 8 |
2 files changed, 15 insertions, 16 deletions
diff --git a/lib/PublicInbox/IMAP.pm b/lib/PublicInbox/IMAP.pm index dd983dfd..64b57a3e 100644 --- a/lib/PublicInbox/IMAP.pm +++ b/lib/PublicInbox/IMAP.pm @@ -1154,13 +1154,8 @@ sub xap_append ($$$$) { } sub parse_query ($$) { - my ($self, $rest) = @_; - if (uc($rest->[0]) eq 'CHARSET') { - shift @$rest; - defined(my $c = shift @$rest) or return 'BAD missing charset'; - $c =~ /\A(?:UTF-8|US-ASCII)\z/ or return 'NO [BADCHARSET]'; - } - my $q = PublicInbox::IMAPsearchqp::parse($self, join(' ', @$rest)); + my ($self, $query) = @_; + my $q = PublicInbox::IMAPsearchqp::parse($self, $query); if (ref($q)) { my $max = $self->{ibx}->over->max; my $beg = 1; @@ -1202,9 +1197,9 @@ sub search_xap_range { # long_response } sub search_common { - my ($self, $tag, $rest, $want_msn) = @_; + my ($self, $tag, $query, $want_msn) = @_; my $ibx = $self->{ibx} or return "$tag BAD No mailbox selected\r\n"; - my $q = parse_query($self, $rest); + my $q = parse_query($self, $query); return "$tag $q\r\n" if !ref($q); my ($sql, $range_info) = delete @$q{qw(sql range_info)}; if (!scalar(keys %$q)) { # overview.sqlite3 @@ -1222,14 +1217,14 @@ sub search_common { } } -sub cmd_uid_search ($$$;) { - my ($self, $tag) = splice(@_, 0, 2); - search_common($self, $tag, \@_); +sub cmd_uid_search ($$$) { + my ($self, $tag, $query) = @_; + search_common($self, $tag, $query); } sub cmd_search ($$$;) { - my ($self, $tag) = splice(@_, 0, 2); - search_common($self, $tag, \@_, 1); + my ($self, $tag, $query) = @_; + search_common($self, $tag, $query, 1); } sub args_ok ($$) { # duplicated from PublicInbox::NNTP diff --git a/lib/PublicInbox/IMAPsearchqp.pm b/lib/PublicInbox/IMAPsearchqp.pm index fba3bacc..c9b442cb 100644 --- a/lib/PublicInbox/IMAPsearchqp.pm +++ b/lib/PublicInbox/IMAPsearchqp.pm @@ -165,7 +165,7 @@ sub msn_set { my $prd = Parse::RecDescent->new(<<'EOG'); <nocheck> { my $q = $PublicInbox::IMAPsearchqp::q; } -search_key : search_key1(s) { $return = $q } +search_key : CHARSET(?) search_key1(s) { $return = $q } search_key1 : "ALL" | "RECENT" | "UNSEEN" | "NEW" | OR_search_keys | NOT_search_key @@ -188,6 +188,10 @@ search_key1 : "ALL" | "RECENT" | "UNSEEN" | "NEW" | sub_query | <error> +charset : /\S+/ +CHARSET : 'CHARSET' charset +{ $item{charset} =~ /\A(?:UTF-8|US-ASCII)\z/ ? 1 : die('NO [BADCHARSET]'); } + SENTSINCE_date : 'SENTSINCE' date { $q->SENTSINCE(\%item) } SENTON_date : 'SENTON' date { $q->SENTON(\%item) } SENTBEFORE_date : 'SENTBEFORE' date { $q->SENTBEFORE(\%item) } @@ -253,7 +257,7 @@ sub parse { %$q = (sql => \$sql, imap => $imap); # imap = PublicInbox::IMAP obj # $::RD_TRACE = 1; my $res = eval { $prd->search_key(uc($query)) }; - return $@ if $@ && $@ =~ /\ABAD /; + return $@ if $@ && $@ =~ /\A(?:BAD|NO) /; return 'BAD unexpected result' if !$res || $res != $q; if (exists $q->{sql}) { delete $q->{xap}; |