From 0c18e0a5e1580587f2bed6669e904b2e27d86e77 Mon Sep 17 00:00:00 2001 From: Joshua Colp Date: Mon, 27 Nov 2006 18:03:57 +0000 Subject: [PATCH] Use the proper function to get the new message count instead of always using the filesystem. (issue #8421 reported by slimey) git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2@48053 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- apps/app_voicemail.c | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c index e76669db7d..a1b46d3188 100644 --- a/apps/app_voicemail.c +++ b/apps/app_voicemail.c @@ -5768,22 +5768,13 @@ static int handle_show_voicemail_users(int fd, int argc, char *argv[]) } } while (vmu) { - char dirname[256]; - DIR *vmdir; - struct dirent *vment; - int vmcount = 0; - char count[12]; + int newmsgs = 0, oldmsgs = 0; + char count[12], tmp[256] = ""; if ((argc == 3) || ((argc == 5) && !strcmp(argv[4],vmu->context))) { - make_dir(dirname, 255, vmu->context, vmu->mailbox, "INBOX"); - if ((vmdir = opendir(dirname))) { - /* No matter what the format of VM, there will always be a .txt file for each message. */ - while ((vment = readdir(vmdir))) - if (strlen(vment->d_name) > 7 && !strncmp(vment->d_name + 7,".txt",4)) - vmcount++; - closedir(vmdir); - } - snprintf(count,sizeof(count),"%d",vmcount); + snprintf(tmp, sizeof(tmp), "%s@%s", vmu->mailbox, ast_strlen_zero(vmu->context) ? "default" : vmu->context); + messagecount(tmp, &newmsgs, &oldmsgs); + snprintf(count,sizeof(count),"%d",newmsgs); ast_cli(fd, output_format, vmu->context, vmu->mailbox, vmu->fullname, vmu->zonetag, count); } vmu = vmu->next;