From 51c92a46442457d34e42556a5f21cf8bc3dc2ec7 Mon Sep 17 00:00:00 2001
From: Jason Parker <jparker@digium.com>
Date: Thu, 10 Apr 2008 17:27:16 +0000
Subject: [PATCH] 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: https://origsvn.digium.com/svn/asterisk/trunk@114036 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---
main/file.c | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
diff --git a/main/file.c b/main/file.c
index e34020ed85..81d51e9a25 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)
--
GitLab