From 6e898936d6e0f44da0992ad09139f0e8e6d141af Mon Sep 17 00:00:00 2001
From: Peter Powell
Date: Mon, 10 Jun 2019 13:40:37 +0100
Subject: Add a method for getting a list of files in a directory.

---
 src/fileutils.cpp | 34 ++++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)

(limited to 'src/fileutils.cpp')

diff --git a/src/fileutils.cpp b/src/fileutils.cpp
index 731e4ea01..d5e1e5839 100644
--- a/src/fileutils.cpp
+++ b/src/fileutils.cpp
@@ -86,6 +86,40 @@ bool FileSystem::FileExists(const std::string& file)
 	return !access(file.c_str(), F_OK);
 }
 
+bool FileSystem::GetFileList(const std::string& directory, std::vector<std::string>& entries, const std::string& match)
+{
+#ifdef _WIN32
+	const std::string search_path = directory + "\\" + match;
+
+	WIN32_FIND_DATAA wfd;
+	HANDLE fh = FindFirstFileA(search_path.c_str(), &wfd);
+	if (fh == INVALID_HANDLE_VALUE)
+		return false;
+
+	do
+	{
+		entries.push_back(wfd.cFileName);
+	} while (FindNextFile(fh, &wfd) != 0);
+
+	FindClose(fh);
+	return true;
+#else
+	DIR* library = opendir(directory.c_str());
+	if (!library)
+		return false;
+
+	dirent* entry = NULL;
+	while ((entry = readdir(library)))
+	{
+		if (InspIRCd::Match(entry->d_name, match, ascii_case_insensitive_map))
+			entries.push_back(entry->d_name);
+	}
+	closedir(library);
+	return true;
+#endif
+}
+
+
 std::string FileSystem::GetFileName(const std::string& name)
 {
 #ifdef _WIN32
-- 
cgit v1.3.1-10-gc9f91


From 5b152cfcd993119c0d0ef87b73b3b0f20c940cdc Mon Sep 17 00:00:00 2001
From: Peter Powell
Date: Thu, 20 Jun 2019 10:24:16 +0100
Subject: Deduplicate dirent.h inclusion.

---
 include/fileutils.h | 4 ----
 src/fileutils.cpp   | 4 ++++
 src/inspircd.cpp    | 1 -
 src/modules.cpp     | 4 ----
 4 files changed, 4 insertions(+), 9 deletions(-)

(limited to 'src/fileutils.cpp')

diff --git a/include/fileutils.h b/include/fileutils.h
index 9623a548d..e50cc8c34 100644
--- a/include/fileutils.h
+++ b/include/fileutils.h
@@ -19,10 +19,6 @@
 
 #pragma once
 
-#ifndef _WIN32
-# include <dirent.h>
-#endif
-
 /** Provides an easy method of reading a text file into memory. */
 class CoreExport FileReader
 {
diff --git a/src/fileutils.cpp b/src/fileutils.cpp
index d5e1e5839..6c98ba300 100644
--- a/src/fileutils.cpp
+++ b/src/fileutils.cpp
@@ -21,6 +21,10 @@
 
 #include <fstream>
 
+#ifndef _WIN32
+# include <dirent.h>
+#endif
+
 FileReader::FileReader(const std::string& filename)
 {
 	Load(filename);
diff --git a/src/inspircd.cpp b/src/inspircd.cpp
index c5d958f87..29cd8acf2 100644
--- a/src/inspircd.cpp
+++ b/src/inspircd.cpp
@@ -30,7 +30,6 @@
 #include <signal.h>
 
 #ifndef _WIN32
-	#include <dirent.h>
 	#include <unistd.h>
 	#include <sys/resource.h>
 	#include <dlfcn.h>
diff --git a/src/modules.cpp b/src/modules.cpp
index 67ebc3439..444e90645 100644
--- a/src/modules.cpp
+++ b/src/modules.cpp
@@ -28,10 +28,6 @@
 #include "exitcodes.h"
 #include <iostream>
 
-#ifndef _WIN32
-	#include <dirent.h>
-#endif
-
 static insp::intrusive_list<dynamic_reference_base>* dynrefs = NULL;
 
 void dynamic_reference_base::reset_all()
-- 
cgit v1.3.1-10-gc9f91