[svn-commits] qwell: branch 1.6.0 r114037 - in /branches/1.6.0: ./ main/file.c

[SVN commits to the Digium repositories]

Author: qwell
Date: Thu Apr 10 12:27:35 2008
New Revision: 114037

URL: http://svn.digium.com/view/asterisk?view=rev&rev=114037
Log:
Merged revisions 114036 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
r114036 | qwell | 2008-04-10 12:27:16 -0500 (Thu, 10 Apr 2008) | 18 lines

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

........

................

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/main/file.c

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/main/file.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/main/file.c?view=diff&rev=114037&r1=114036&r2=114037
==============================================================================
--- branches/1.6.0/main/file.c (original)
+++ branches/1.6.0/main/file.c Thu Apr 10 12:27:35 2008
@@ -467,7 +467,7 @@
 		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 {
@@ -505,11 +505,6 @@
 
 	if (buf == NULL) {
 		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: