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

filebundle: correct possible bug with fb_scandir() on some FSs

Browse source
This commit is contained in:
Adam Sutton 2013-05-24 16:40:30 +01:00
parent 3bc769589f
commit be96d69e26
1 changed files with 16 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/filebundle.c
View file

@ -306,7 +306,22 @@ int fb_scandir ( const char *path, fb_dirent ***list )
for (i = 0; i < ret; i++) {
(*list)[i] = calloc(1, sizeof(fb_dirent));
strcpy((*list)[i]->name, de[i]->d_name);
(*list)[i]->type = de[i]->d_type == DT_DIR ? FB_DIR : FB_FILE;
switch(de[i]->d_type) {
case DT_DIR:
(*list)[i]->type = FB_DIR;
break;
case DT_REG:
(*list)[i]->type = FB_FILE;
break;
default: {
struct stat st;
char buf[512];
snprintf(buf, sizeof(buf), "%s/%s", dir->d.root, de[i]->d_name);
if (!lstat(buf, &st))
(*list)[i]->type = S_ISDIR(st.st_mode) ? FB_DIR : FB_FILE;
break;
}
}
free(de[i]);
}
free(de);