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

Fix mistake in bundling code that means settings not loaded from install path.

Browse source
This commit is contained in:
Adam Sutton 2012-08-21 19:36:16 +01:00
parent 84ad33957a
commit 6bdf0181f1
1 changed files with 19 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
src/filebundle.c
View file

@ -293,13 +293,13 @@ int fb_scandir ( const char *path, fb_dirent ***list )
{
int i, ret = -1;
struct dirent **de;
struct filebundle_stat st;
if (fb_stat(path, &st)) return -1;
if (!st.is_dir) return -1;
fb_dir *dir;
if (!(dir = fb_opendir(path))) return -1;
/* Direct */
if (st.type == FB_DIRECT) {
if ((ret = scandir(path, &de, NULL, NULL)) != -1) {
if (dir->type == FB_DIRECT) {
if ((ret = scandir(dir->d.root, &de, NULL, NULL)) != -1) {
if (ret == 0) return 0;
*list = malloc(sizeof(fb_dirent*)*ret);
for (i = 0; i < ret; i++) {
@ -313,22 +313,22 @@ int fb_scandir ( const char *path, fb_dirent ***list )
/* Bundle */
} else {
fb_dir *dir;
if ((dir = fb_opendir(path))) {
const filebundle_entry_t *fb;
ret = dir->b.root->d.count;
fb = dir->b.root->d.child;
*list = malloc(ret * sizeof(fb_dirent));
i = 0;
while (fb) {
(*list)[i] = calloc(1, sizeof(fb_dirent));
strcpy((*list)[i]->name, fb->name);
fb = fb->next;
i++;
}
fb_closedir(dir);
const filebundle_entry_t *fb;
ret = dir->b.root->d.count;
fb = dir->b.root->d.child;
*list = malloc(ret * sizeof(fb_dirent));
i = 0;
while (fb) {
(*list)[i] = calloc(1, sizeof(fb_dirent));
strcpy((*list)[i]->name, fb->name);
fb = fb->next;
i++;
}
}
/* Close */
fb_closedir(dir);
return ret;
}