]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
media_index: Make media indexing tolerable of bad symlinks.
authorJoshua Colp <jcolp@digium.com>
Tue, 3 Dec 2013 16:39:13 +0000 (16:39 +0000)
committerJoshua Colp <jcolp@digium.com>
Tue, 3 Dec 2013 16:39:13 +0000 (16:39 +0000)
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

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@403313 65c4cc65-6c06-0410-ace0-fbb531ad65f3

main/media_index.c

index 278b37c2641263fe79c1af08275e4738f2bf2ec9..a643c237f32bacb81936124dbfd8d412ba3acb50 100644 (file)
@@ -551,9 +551,8 @@ static int media_index_update(struct ast_media_index *index,
                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)) {