[asterisk-commits] file: trunk r403313 - in /trunk: ./ main/media_index.c

[SVN commits to the Asterisk project]

Author: file
Date: Tue Dec  3 10:39:13 2013
New Revision: 403313

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=403313
Log:
media_index: Make media indexing tolerable of bad symlinks.

Media indexing will now skip over files and directories that stat
will not return information about. This can occur under normal
conditions when a symbolic link points to a location that no longer
exists.
........

Merged revisions 403312 from http://svn.asterisk.org/svn/asterisk/branches/12

Modified:
    trunk/   (props changed)
    trunk/main/media_index.c

Propchange: trunk/
------------------------------------------------------------------------------
--- branch-12-merged (original)
+++ branch-12-merged Tue Dec  3 10:39:13 2013
@@ -1,1 +1,1 @@
-/branches/12:1-398558,398560-398577,398579-399305,399307-401390,401392-403175,403179,403207,403209,403221,403223,403240,403256,403258,403271,403290
+/branches/12:1-398558,398560-398577,398579-399305,399307-401390,401392-403175,403179,403207,403209,403221,403223,403240,403256,403258,403271,403290,403312

Modified: trunk/main/media_index.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/media_index.c?view=diff&rev=403313&r1=403312&r2=403313
==============================================================================
--- trunk/main/media_index.c (original)
+++ trunk/main/media_index.c Tue Dec  3 10:39:13 2013
@@ -551,9 +551,8 @@
 		ast_str_set(&statfile, 0, "%s/%s", ast_str_buffer(index_dir), dent->d_name);
 
 		if (stat(ast_str_buffer(statfile), &st) < 0) {
-			ast_log(LOG_ERROR, "Failed to stat %s: %s\n", ast_str_buffer(statfile), strerror(errno));
-			res = -1;
-			break;
+			ast_log(LOG_WARNING, "Failed to stat %s: %s\n", ast_str_buffer(statfile), strerror(errno));
+			continue;
 		}
 
 		if (S_ISDIR(st.st_mode)) {