diff options
author | mnicholson <mnicholson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-11-30 21:37:21 +0000 |
---|---|---|
committer | mnicholson <mnicholson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-11-30 21:37:21 +0000 |
commit | 6c919bbaa07cd613beb00a82fae42c87a5119373 (patch) | |
tree | c1b9c7a95644a3f561124323bc76827aca902d3c /main/file.c | |
parent | 0d6be1d9f8ddd58ea19e14af1b3989b0887d7346 (diff) |
Merged revisions 231688 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r231688 | mnicholson | 2009-11-30 15:31:55 -0600 (Mon, 30 Nov 2009) | 15 lines
Merged revisions 231614 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r231614 | mnicholson | 2009-11-30 15:11:44 -0600 (Mon, 30 Nov 2009) | 8 lines
Remove duplicate entries from voicemail format lists. This prevents app_voicemail from entering an infinite loop when the same format is specified twice in the format list.
(closes issue #15625)
Reported by: Shagg63
Tested by: mnicholson
Review: https://reviewboard.asterisk.org/r/429/
........
................
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@231691 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main/file.c')
-rw-r--r-- | main/file.c | 60 |
1 files changed, 60 insertions, 0 deletions
diff --git a/main/file.c b/main/file.c index 853bdc797..b53ba97f2 100644 --- a/main/file.c +++ b/main/file.c @@ -1335,6 +1335,66 @@ int ast_stream_and_wait(struct ast_channel *chan, const char *file, const char * return res; } +char *ast_format_str_reduce(char *fmts) +{ + struct ast_format *f; + struct ast_format *fmts_ptr[AST_MAX_FORMATS]; + char *fmts_str[AST_MAX_FORMATS]; + char *stringp, *type; + char *orig = fmts; + int i, j, x, found; + int len = strlen(fmts) + 1; + + if (AST_RWLIST_RDLOCK(&formats)) { + ast_log(LOG_WARNING, "Unable to lock format list\n"); + return NULL; + } + + stringp = ast_strdupa(fmts); + + for (x = 0; (type = strsep(&stringp, "|")) && x < AST_MAX_FORMATS; x++) { + AST_RWLIST_TRAVERSE(&formats, f, list) { + if (exts_compare(f->exts, type)) { + found = 1; + break; + } + } + + fmts_str[x] = type; + if (found) { + fmts_ptr[x] = f; + } else { + fmts_ptr[x] = NULL; + } + } + AST_RWLIST_UNLOCK(&formats); + + for (i = 0; i < x; i++) { + /* special handling for the first entry */ + if (i == 0) { + fmts += snprintf(fmts, len, "%s", fmts_str[i]); + len -= (fmts - orig); + continue; + } + + found = 0; + for (j = 0; j < i; j++) { + /* this is a duplicate */ + if (fmts_ptr[j] == fmts_ptr[i]) { + found = 1; + break; + } + } + + if (!found) { + fmts += snprintf(fmts, len, "|%s", fmts_str[i]); + len -= (fmts - orig); + } + } + + return orig; +} + static char *handle_cli_core_show_file_formats(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a) { #define FORMAT "%-10s %-10s %-20s\n" |