diff options
-rw-r--r-- | apps/app_voicemail.c | 19 |
1 files changed, 5 insertions, 14 deletions
diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c index e76669db7..a1b46d318 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; |