sysmocom
/
asterisk
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merged revisions 104593 via svnmerge from 

https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r104593 | kpfleming | 2008-02-27 10:53:06 -0600 (Wed, 27 Feb 2008) | 8 lines

fallback to standard English prompts properly when using new prompt directory layout

(closes issue #11831)
Reported by: IgorG
Patches:
      fallbacken.v1.diff uploaded by IgorG (license 20) (modified by me to improve code and conform rest of function to coding guidelines)


........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@104594 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Kevin P. Fleming 2008-02-27 16:54:14 +00:00
parent 1e749e9773
commit 892a6b95be
1 changed files with 22 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
main/file.c
View File

@ -467,33 +467,37 @@ static int ast_filehelper(const char *filename, const void *arg2, const char *fm
* which on success is filled with the matching filename. * which on success is filled with the matching filename.
*/ */
static int fileexists_core(const char *filename, const char *fmt, const char *preflang, static int fileexists_core(const char *filename, const char *fmt, const char *preflang,
char *buf, int buflen) char *buf, int buflen)
{ {
int res = -1; int res = -1;
int langlen; /* length of language string */ int langlen; /* length of language string */
const char *c = strrchr(filename, '/'); const char *c = strrchr(filename, '/');
int offset = c ? c - filename + 1 : 0; /* points right after the last '/' */ int offset = c ? c - filename + 1 : 0; /* points right after the last '/' */
if (preflang == NULL) if (preflang == NULL) {
preflang = ""; preflang = "";
}
langlen = strlen(preflang); langlen = strlen(preflang);
if (buflen < langlen + strlen(filename) + 2) { if (buflen < langlen + strlen(filename) + 4) {
ast_log(LOG_WARNING, "buffer too small\n"); ast_log(LOG_WARNING, "buffer too small, allocating larger buffer\n");
buf[0] = '\0'; /* set to empty */ buf = alloca(langlen + strlen(filename) + 4); /* room for everything */
buf = alloca(langlen + strlen(filename) + 2); /* room for everything */
} }
if (buf == NULL)
if (buf == NULL) {
return 0; return 0;
buf[0] = '\0'; }
for (;;) { for (;;) {
if (ast_language_is_prefix) { /* new layout */ if (ast_language_is_prefix) { /* new layout */
if (langlen) { if (langlen) {
strcpy(buf, preflang); strcpy(buf, preflang);
buf[langlen] = '/'; buf[langlen] = '/';
strcpy(buf + langlen + 1, filename); strcpy(buf + langlen + 1, filename);
} else } else {
strcpy(buf, filename); /* first copy the full string */ strcpy(buf, "en/"); /* English - fallback if no file found in preferred language */
strcpy(buf + 3, filename);
}
} else { /* old layout */ } else { /* old layout */
strcpy(buf, filename); /* first copy the full string */ strcpy(buf, filename); /* first copy the full string */
if (langlen) { if (langlen) {
@ -503,15 +507,19 @@ static int fileexists_core(const char *filename, const char *fmt, const char *pr
} }
} }
res = ast_filehelper(buf, NULL, fmt, ACTION_EXISTS); res = ast_filehelper(buf, NULL, fmt, ACTION_EXISTS);
if (res > 0) /* found format */ if (res > 0) { /* found format */
break; break;
if (langlen == 0) /* no more formats */ }
if (langlen == 0) { /* no more formats */
break; break;
if (preflang[langlen] == '_') /* we are on the local suffix */ }
if (preflang[langlen] == '_') { /* we are on the local suffix */
langlen = 0; /* try again with no language */ langlen = 0; /* try again with no language */
else } else {
langlen = (c = strchr(preflang, '_')) ? c - preflang : 0; langlen = (c = strchr(preflang, '_')) ? c - preflang : 0;
}
} }
return res; return res;
} }