diff options
| author | Richard Mudgett <rmudgett@digium.com> | 2013-12-09 19:24:58 +0000 |
|---|---|---|
| committer | Richard Mudgett <rmudgett@digium.com> | 2013-12-09 19:24:58 +0000 |
| commit | c91d4d12de43324cc4a0a318f525935ecfecef54 (patch) | |
| tree | 423ae42050b7725c4d812edc00d3131de0a5b04d /res/res_sorcery_astdb.c | |
| parent | 31d51d373bb52e06fca781287eff2ad2063abbaa (diff) | |
Reverting regex part of -r403545 at request of file.
res_sorcery_astdb.c: Fix get multiple records by regex.
* Fix sorcery_astdb_retrieve_regex() pattern matching. Let the regexec()
function match the stored key values instead of having astdb prefilter
them. Previoiusly you could only use a simple regex pattern when the
pattern began with '^'.
........
Merged revisions 403559 from http://svn.asterisk.org/svn/asterisk/branches/12
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@403560 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'res/res_sorcery_astdb.c')
| -rw-r--r-- | res/res_sorcery_astdb.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/res/res_sorcery_astdb.c b/res/res_sorcery_astdb.c index 61a607ffd..ae1b680ee 100644 --- a/res/res_sorcery_astdb.c +++ b/res/res_sorcery_astdb.c @@ -218,14 +218,20 @@ static void sorcery_astdb_retrieve_multiple(const struct ast_sorcery *sorcery, v static void sorcery_astdb_retrieve_regex(const struct ast_sorcery *sorcery, void *data, const char *type, struct ao2_container *objects, const char *regex) { const char *prefix = data; - char family[strlen(prefix) + strlen(type) + 2]; + char family[strlen(prefix) + strlen(type) + 2], tree[strlen(regex) + 1]; RAII_VAR(struct ast_db_entry *, entries, NULL, ast_db_freetree); regex_t expression; struct ast_db_entry *entry; snprintf(family, sizeof(family), "%s/%s", prefix, type); - if (!(entries = ast_db_gettree(family, NULL)) || regcomp(&expression, regex, REG_EXTENDED | REG_NOSUB)) { + if (regex[0] == '^') { + snprintf(tree, sizeof(tree), "%s%%", regex + 1); + } else { + tree[0] = '\0'; + } + + if (!(entries = ast_db_gettree(family, tree)) || regcomp(&expression, regex, REG_EXTENDED | REG_NOSUB)) { return; } |