[svn-commits] russell: trunk r46966 - in /trunk: ./ res/res_musiconhold.c

[svn-commits at lists.digium.com]

Author: russell
Date: Thu Nov  2 11:51:56 2006
New Revision: 46966

URL: http://svn.digium.com/view/asterisk?rev=46966&view=rev
Log:
Merged revisions 46965 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

................
r46965 | russell | 2006-11-02 12:49:54 -0500 (Thu, 02 Nov 2006) | 11 lines

Merged revisions 46964 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r46964 | russell | 2006-11-02 12:47:56 -0500 (Thu, 02 Nov 2006) | 3 lines

ignore files in a music on hold directory that begin with '.'
(issue #8249, cboie)

........

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

Modified:
    trunk/   (props changed)
    trunk/res/res_musiconhold.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/res/res_musiconhold.c
URL: http://svn.digium.com/view/asterisk/trunk/res/res_musiconhold.c?rev=46966&r1=46965&r2=46966&view=diff
==============================================================================
--- trunk/res/res_musiconhold.c (original)
+++ trunk/res/res_musiconhold.c Thu Nov  2 11:51:56 2006
@@ -778,6 +778,10 @@
 	while ((files_dirent = readdir(files_DIR))) {
 		/* The file name must be at least long enough to have the file type extension */
 		if ((strlen(files_dirent->d_name) < 4))
+			continue;
+
+		/* Skip files that starts with a dot */
+		if (files_dirent->d_name[0] == '.')
 			continue;
 
 		/* Skip files without extensions... they are not audio */