From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: X-Spam-Status: No, score=-4.1 required=3.0 tests=ALL_TRUSTED,AWL,BAYES_00, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF, T_SCC_BODY_TEXT_LINE shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from localhost (dcvr.yhbt.net [127.0.0.1]) by dcvr.yhbt.net (Postfix) with ESMTP id 5B6DA1F403; Fri, 8 Jul 2022 11:36:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=80x24.org; s=selector1; t=1657280197; bh=79Feg/0C55rmGwcjIfu7jSmbkOEaDsrd+Mcv9ztf1Zo=; h=From:To:Subject:Date:From; b=VcYXE3YOJTAL3O5ivcake5MLIPCA7nmV84+P9h60ykhA6QzDC1zDmJghFB6ftmLg5 3gs3Lt2pUOZbUz+WiFmc8rdxMIM4dQ5TT1WqKJ/YlU8f8yZ0i7zcRjtttHEkZZz496 jPiUjWhAZc+5mhFfGgiIZk1V0tjyGEXCZsHD6TDk= From: Eric Wong To: meta@public-inbox.org Subject: [PATCH] imap: STATUS: count messages properly Date: Fri, 8 Jul 2022 11:36:37 +0000 Message-Id: <20220708113637.1241370-1-e@80x24.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit List-Id: 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 | 3 ++- t/imapd.t | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/lib/PublicInbox/IMAP.pm b/lib/PublicInbox/IMAP.pm index d47e4c2f..7e695fd8 100644 --- a/lib/PublicInbox/IMAP.pm +++ b/lib/PublicInbox/IMAP.pm @@ -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 { diff --git a/t/imapd.t b/t/imapd.t index 80757a9d..43de8675 100644 --- a/t/imapd.t +++ b/t/imapd.t @@ -1,5 +1,5 @@ #!perl -w -# Copyright (C) 2020-2021 all contributors +# Copyright (C) all contributors # License: AGPL-3.0+ # 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;