diff options
| author | qwell <qwell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-04-10 17:27:16 +0000 |
|---|---|---|
| committer | qwell <qwell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-04-10 17:27:16 +0000 |
| commit | 76c6b355080abf62df0b523f7c942c7131154f55 (patch) | |
| tree | 639fc23cf2f003d68227ed635f26abd01b5bfafe /main/file.c | |
| parent | c18817ccf8f0c700f1e97ea6340c8b53e61903d2 (diff) | |
Merged revisions 114035 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r114035 | qwell | 2008-04-10 12:26:10 -0500 (Thu, 10 Apr 2008) | 10 lines
Only try to prefix language if we are not using an absolute path (suffix it otherwise).
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: http://svn.digium.com/svn/asterisk/trunk@114036 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main/file.c')
| -rw-r--r-- | main/file.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/main/file.c b/main/file.c index e34020ed8..81d51e9a2 100644 --- a/main/file.c +++ b/main/file.c @@ -467,7 +467,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 { @@ -507,11 +507,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) |