]> Sergey Matveev's repositories - public-inbox.git/commitdiff
imap: STATUS: count messages properly
authorEric Wong <e@80x24.org>
Fri, 8 Jul 2022 11:36:37 +0000 (11:36 +0000)
committerEric Wong <e@80x24.org>
Fri, 8 Jul 2022 12:16:39 +0000 (12:16 +0000)
This only affects the rarely-used STATUS command, our message
count was consistely zero due to misusing ->imap_exists.

Noticed while implementing POP3 server.

lib/PublicInbox/IMAP.pm
t/imapd.t

index d47e4c2f12e0993db5cd9b67667d786695502d28..7e695fd8e0eb20c5e37ffb10152cd361967aa1b1 100644 (file)
@@ -399,7 +399,8 @@ sub inbox_lookup ($$;$) {
                        $self->{ibx} = $ibx;
                        $self->{uo2m} = uo2m_ary_new($self, \$exists);
                } else {
-                       $exists = $over->imap_exists;
+                       my $uid_end = $uid_base + UID_SLICE;
+                       $exists = $over->imap_exists($uid_base, $uid_end);
                }
                ensure_slices_exist($self->{imapd}, $ibx, $over->max);
        } else {
index 80757a9d4071610ccb66ce924a2690de07055a33..43de867548c651ab89bb98bc51d8211e768cee28 100644 (file)
--- a/t/imapd.t
+++ b/t/imapd.t
@@ -1,5 +1,5 @@
 #!perl -w
-# Copyright (C) 2020-2021 all contributors <meta@public-inbox.org>
+# Copyright (C) all contributors <meta@public-inbox.org>
 # License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
 # end-to-end IMAP tests, see unit tests in t/imap.t, too
 use strict;
@@ -99,7 +99,8 @@ ok($mic->examine($mailbox1), 'EXAMINE succeeds');
 my @raw = $mic->status($mailbox1, qw(Messages uidnext uidvalidity));
 is(scalar(@raw), 2, 'got status response');
 like($raw[0], qr/\A\*\x20STATUS\x20inbox\.i1\.$first_range\x20
-       \(MESSAGES\x20\d+\x20UIDNEXT\x20\d+\x20UIDVALIDITY\x20\d+\)\r\n/sx);
+       \(MESSAGES\x20[1-9][0-9]*\x20
+       UIDNEXT\x20\d+\x20UIDVALIDITY\x20\d+\)\r\n/sx);
 like($raw[1], qr/\A\S+ OK /, 'finished status response');
 
 my @orig_list = @raw = $mic->list;