Alexander/nsxiv
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Allow opening directories non-recursively

Browse Source
This commit is contained in:
Paride Legovini
2016-09-28 18:59:15 +02:00
committed by Bert Münnich
parent d69f39e3aa
commit 86dc6860f9
5 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
util.c
View File

@ -89,7 +89,7 @@ void size_readable(float *size, const char **unit)
*unit = units[MIN(i, ARRLEN(units) - 1)];
}
int r_opendir(r_dir_t *rdir, const char *dirname)
int r_opendir(r_dir_t *rdir, const char *dirname, bool recursive)
{
if (*dirname == '\0')
return -1;
@ -106,6 +106,7 @@ int r_opendir(r_dir_t *rdir, const char *dirname)
rdir->name = (char*) dirname;
rdir->d = 0;
rdir->recursive = recursive;
return 0;
}
@ -167,7 +168,7 @@ char* r_readdir(r_dir_t *rdir)
return filename;
}
if (rdir->stlen > 0) {
if (rdir->recursive && rdir->stlen > 0) {
/* open next subdirectory */
closedir(rdir->dir);
if (rdir->d != 0)