[PATCH 7/7] Files: use the new opendir() wrapper

[Lubomir I. Ivanov]

From: "Lubomir I. Ivanov" <neolit123 at gmail.com>

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 at gmail.com>
---
 uemis-downloader.c | 25 ++++++++++++++++++++-----
 1 file changed, 20 insertions(+), 5 deletions(-)

diff --git a/uemis-downloader.c b/uemis-downloader.c
index f69a352..2b25156 100644
--- a/uemis-downloader.c
+++ b/uemis-downloader.c
@@ -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;
 }
 
-- 
1.7.11.msysgit.0