Use stat properly (you don't want to open directories or devices...)

7a6a5001 · Rémi Denis-Courmont · 7615bbd6 · 7a6a5001
Commit 7a6a5001 authored Sep 18, 2008 by Rémi Denis-Courmont
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 4 deletions

src/input/input.c src/input/input.c +3 -4

No files found.
--- a/src/input/input.c
+++ b/src/input/input.c
@@ -2643,9 +2643,8 @@ static char *InputGetExtraFiles( input_thread_t *p_input,
        snprintf( psz_ext, 5, ".%.3d", i );
-        if( utf8_stat( psz_file, &st ) != 0 )
+        if( utf8_stat( psz_file, &st )
-            break;
+         || !S_ISREG( st.st_mode ) || !st.st_size )
-        if( st.st_size <= 0 )
            continue;
        msg_Dbg( p_input, "Detected extra file `%s'", psz_file );
@@ -2993,7 +2992,7 @@ static void SubtitleAdd( input_thread_t *p_input, char *psz_subtitle, bool b_for
            strcpy( psz_extension, ".idx" );
-            if( !utf8_stat( psz_path, &st ) )
+            if( !utf8_stat( psz_path, &st ) && S_ISREG( st.st_mode ) )
            {
                msg_Dbg( p_input, "using %s subtitles file instead of %s",
                         psz_path, psz_subtitle );