From 49ef635a6df5c921d7974d8546f2f39d56941c16 Mon Sep 17 00:00:00 2001
From: Jason Parker <jparker@digium.com>
Date: Thu, 6 Mar 2008 22:11:30 +0000
Subject: [PATCH] Fix file playback in many cases.
(closes issue #12115)
Reported by: pj
Patches:
v2-fileexists.patch uploaded by dimas (license 88) (with modifications by me)
Tested by: dimas, qwell, russell
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@106439 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---
main/file.c | 112 +++++++++++++++++++++++++++++++++-------------------
1 file changed, 71 insertions(+), 41 deletions(-)
diff --git a/main/file.c b/main/file.c
index 16fe39e777..fb684755e5 100644
--- a/main/file.c
+++ b/main/file.c
@@ -455,6 +455,37 @@ static int ast_filehelper(const char *filename, const void *arg2, const char *fm
return res;
}
+static int is_absolute_path(const char *filename)
+{
+ return filename[0] == '/';
+}
+
+static int fileexists_test(const char *filename, const char *fmt, const char *lang,
+ char *buf, int buflen)
+{
+ if (buf == NULL) {
+ return -1;
+ }
+
+ if (ast_language_is_prefix) { /* new layout */
+ if (lang) {
+ snprintf(buf, buflen, "%s/%s", lang, filename);
+ } else {
+ snprintf(buf, buflen, "%s", filename);
+ }
+ } else { /* old layout */
+ strcpy(buf, filename); /* first copy the full string */
+ if (lang) {
+ /* insert the language and suffix if needed */
+ const char *c = strrchr(filename, '/');
+ int offset = c ? c - filename + 1 : 0; /* points right after the last '/' */
+ snprintf(buf + offset, buflen - offset, "%s/%s", lang, filename + offset);
+ }
+ }
+
+ return ast_filehelper(buf, NULL, fmt, ACTION_EXISTS);
+}
+
/*!
* \brief helper routine to locate a file with a given format
* and language preference.
@@ -470,57 +501,56 @@ static int fileexists_core(const char *filename, const char *fmt, const char *pr
char *buf, int buflen)
{
int res = -1;
- int langlen; /* length of language string */
- const char *c = strrchr(filename, '/');
- int offset = c ? c - filename + 1 : 0; /* points right after the last '/' */
+ char *lang = NULL;
- if (preflang == NULL) {
- preflang = "";
- }
- langlen = strlen(preflang);
-
- if (buflen < langlen + strlen(filename) + 4) {
- ast_log(LOG_WARNING, "buffer too small, allocating larger buffer\n");
- buf = alloca(langlen + strlen(filename) + 4); /* room for everything */
+ if (buf == NULL) {
+ return -1;
}
- if (buf == NULL) {
- return 0;
+ if (is_absolute_path(filename)) {
+ ast_copy_string(buf, filename, buflen);
+ return ast_filehelper(buf, NULL, fmt, ACTION_EXISTS);
}
- for (;;) {
- if (ast_language_is_prefix) { /* new layout */
- if (langlen) {
- strcpy(buf, preflang);
- buf[langlen] = '/';
- strcpy(buf + langlen + 1, filename);
- } else {
- strcpy(buf, "en/"); /* English - fallback if no file found in preferred language */
- strcpy(buf + 3, filename);
- }
- } else { /* old layout */
- strcpy(buf, filename); /* first copy the full string */
- if (langlen) {
- /* insert the language and suffix if needed */
- strcpy(buf + offset, preflang);
- sprintf(buf + offset + langlen, "/%s", filename + offset);
+ /* We try languages in the following order:
+ * preflang (may include dialect)
+ * lang (preflang without dialect - if any)
+ * <none>
+ * default (unless the same as preflang or lang without dialect)
+ */
+
+ /* Try preferred language */
+ if (!ast_strlen_zero(preflang)) {
+ /* try the preflang exactly as it was requested */
+ if ((res = fileexists_test(filename, fmt, preflang, buf, buflen)) > 0) {
+ return res;
+ } else {
+ /* try without a dialect */
+ char *postfix = NULL;
+ postfix = lang = ast_strdupa(preflang);
+
+ strsep(&postfix, "_");
+ if (postfix) {
+ if ((res = fileexists_test(filename, fmt, lang, buf, buflen)) > 0) {
+ return res;
+ }
}
}
- res = ast_filehelper(buf, NULL, fmt, ACTION_EXISTS);
- if (res > 0) { /* found format */
- break;
- }
- if (langlen == 0) { /* no more formats */
- break;
- }
- if (preflang[langlen] == '_') { /* we are on the local suffix */
- langlen = 0; /* try again with no language */
- } else {
- langlen = (c = strchr(preflang, '_')) ? c - preflang : 0;
+ }
+
+ /* Try without any language */
+ if ((res = fileexists_test(filename, fmt, NULL, buf, buflen)) > 0) {
+ return res;
+ }
+
+ /* Finally try the default language unless it was already tried before */
+ if ((ast_strlen_zero(preflang) || strcmp(preflang, DEFAULT_LANGUAGE)) && (ast_strlen_zero(lang) || strcmp(lang, DEFAULT_LANGUAGE))) {
+ if ((res = fileexists_test(filename, fmt, DEFAULT_LANGUAGE, buf, buflen)) > 0) {
+ return res;
}
}
- return res;
+ return 0;
}
struct ast_filestream *ast_openstream(struct ast_channel *chan, const char *filename, const char *preflang)
--
GitLab