stv0g/tvheadend
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fix open file handle bug and reduce mux config scan depth. Fixes #1325.

Browse source
This commit is contained in:
Adam Sutton 2012-10-14 11:22:04 +01:00
parent b232f5ee06
commit 7b6ed15eb9
1 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/muxes.c
View file

@ -289,7 +289,10 @@ static void _muxes_load_file
str++;
}
}
if (!reg) return;
if (!reg) {
fb_close(fp);
return;
}
/* Network */
str = buf;
@ -338,19 +341,22 @@ static void _muxes_load_file
*
* Note: should we follow symlinks?
*/
static void _muxes_load_dir ( const char *path, const char *type )
static void _muxes_load_dir
( const char *path, const char *type, int lvl )
{
char p[256];
fb_dir *dir;
fb_dirent *de;
if (lvl >= 3) return;
if (!(dir = fb_opendir(path))) return;
lvl++;
while ((de = fb_readdir(dir))) {
if (*de->name == '.') continue;
if (de->type == FB_DIR) {
snprintf(p, sizeof(p), "%s/%s", path, de->name);
_muxes_load_dir(p, de->name);
_muxes_load_dir(p, de->name, lvl+1);
} else if (type) {
_muxes_load_file(type, dir, de->name);
}
@ -371,5 +377,5 @@ void muxes_init ( void )
#else
path = "/usr/share/dvb";
#endif
_muxes_load_dir(path, NULL);
_muxes_load_dir(path, NULL, 0);
}