kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-04 11:58:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Only try to prefix language if we are not using an absolute path (suffix it otherwise).

Browse Source 
en/var/lib/asterisk/sounds/blah.gsm is a very silly path.

(closes issue #12379)
Reported by: kuj
Patches:
      12379-absolutepath.diff uploaded by qwell (license 4)
Tested by: kuj, qwell


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@114035 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Jason Parker
2008-04-10 17:26:10 +00:00
parent da024e5196
commit 6d08d42e0e
1 changed files with 1 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
main/file.c
View File

@@ -487,7 +487,7 @@ static int fileexists_test(const char *filename, const char *fmt, const char *la
return -1;
}
if (ast_language_is_prefix) { /* new layout */
if (ast_language_is_prefix && !is_absolute_path(filename)) { /* new layout */
if (lang) {
snprintf(buf, buflen, "%s/%s", lang, filename);
} else {
@@ -527,11 +527,6 @@ static int fileexists_core(const char *filename, const char *fmt, const char *pr
return -1;
}
if (is_absolute_path(filename)) {
ast_copy_string(buf, filename, buflen);
return ast_filehelper(buf, NULL, fmt, ACTION_EXISTS);
}
/* We try languages in the following order:
* preflang (may include dialect)
* lang (preflang without dialect - if any)