mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2024-11-28 05:00:20 +00:00
Code Issues Projects Releases Packages Wiki Activity

Files: use the new opendir() wrapper

Browse source 
This is a separate patch because it required more changes
and branches due to how opendir() works on win32
with the separate struct type _WDIR and the according _w...
methods for it.

Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Lubomir I. Ivanov 2013-12-19 15:00:56 +02:00 committed by Dirk Hohndel
parent 86ed014339
commit a351bbde24
1 changed files with 20 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
uemis-downloader.c
View file

@ -139,18 +139,33 @@ static long bytes_available(int file)
static int number_of_file(char *path)
{
int count = 0;
DIR * dirp;
struct dirent * entry;
#ifdef WIN32
struct _wdirent *entry;
_WDIR *dirp = (_WDIR *)subsurface_opendir(path);
#else
struct dirent *entry;
DIR *dirp = (DIR *)subsurface_opendir(path);
#endif
dirp = opendir(path);
while (dirp && (entry = readdir(dirp)) != NULL) {
#ifndef WIN32
while (dirp) {
#ifdef WIN32
entry = _wreaddir(dirp);
if (!entry)
break;
#else
entry = readdir(dirp);
if (!entry)
break;
if (entry->d_type == DT_REG) /* If the entry is a regular file */
#endif
count++;
}
#ifdef WIN32
_wclosedir(dirp);
#else
closedir(dirp);
#endif
return count;
}