#include <vlc_fs.h>
#include <vlc_url.h>
-#ifdef HAVE_DIRENT_H
-# include <dirent.h>
-#endif
-
#ifdef HAVE_UNISTD_H
# include <unistd.h>
#endif
subdirs = paths_to_list( f_dir, psz_path );
for( j = -1, i_sub_count = 0; (j == -1) || ( j >= 0 && subdirs != NULL && subdirs[j] != NULL ); j++ )
{
- const char *psz_dir = j < 0 ? f_dir : subdirs[j];
- char **ppsz_dir_content;
- int i_dir_content;
-
+ const char *psz_dir = (j < 0) ? f_dir : subdirs[j];
if( psz_dir == NULL || ( j >= 0 && !strcmp( psz_dir, f_dir ) ) )
continue;
/* parse psz_src dir */
- i_dir_content = vlc_scandir( psz_dir, &ppsz_dir_content,
- subtitles_Filter, NULL );
- if( i_dir_content < 0 )
+ DIR *dir = vlc_opendir( psz_dir );
+ if( dir == NULL )
continue;
msg_Dbg( p_this, "looking for a subtitle file in %s", psz_dir );
- for( int a = 0; a < i_dir_content && i_sub_count < MAX_SUBTITLE_FILES ; a++ )
+
+ char *psz_name;
+ while( (psz_name = vlc_readdir( dir )) && i_sub_count < MAX_SUBTITLE_FILES )
{
- char *psz_name = ppsz_dir_content[a];
+ if( psz_name[0] == '.' || !subtitles_Filter( psz_name ) )
+ {
+ free( psz_name );
+ continue;
+ }
+
char tmp_fname_noext[strlen( psz_name ) + 1];
char tmp_fname_trim[strlen( psz_name ) + 1];
char tmp_fname_ext[strlen( psz_name ) + 1];
int i_prio;
- if( psz_name == NULL || psz_name[0] == '.' )
- continue;
-
/* retrieve various parts of the filename */
strcpy_strip_ext( tmp_fname_noext, psz_name );
strcpy_get_ext( tmp_fname_ext, psz_name );
sprintf( psz_path, "%s"DIR_SEP"%s", psz_dir, psz_name );
if( !strcmp( psz_path, psz_fname ) )
+ {
+ free( psz_name );
continue;
+ }
if( !vlc_stat( psz_path, &st ) && S_ISREG( st.st_mode ) && result )
{
psz_path, i_prio );
}
}
+ free( psz_name );
}
- if( ppsz_dir_content )
- {
- for( int a = 0; a < i_dir_content; a++ )
- free( ppsz_dir_content[a] );
- free( ppsz_dir_content );
- }
+ closedir( dir );
}
if( subdirs )
{