File 0001-all_filenames_from_dir-Fix-finding-files-o... of Package mingw32-ktoblzcheck

Overview Repositories Revisions Requests Users Attributes Meta

File 0001-all_filenames_from_dir-Fix-finding-files-on-Windows.txt of Package mingw32-ktoblzcheck (Revision 9ea1913fa9b42b3472e6e18f6f2de854)

Currently displaying revision 9ea1913fa9b42b3472e6e18f6f2de854 , Show latest

From aec93e068a1185b99647cab05f99530776435610 Mon Sep 17 00:00:00 2001
From: Ralf Habacker <ralf.habacker@freenet.de>
Date: Thu, 19 Sep 2019 16:44:58 +0200
Subject: [PATCH] all_filenames_from_dir(): Fix finding files on Windows

---
 src/lib/ktoblzcheck.cc | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/lib/ktoblzcheck.cc b/src/lib/ktoblzcheck.cc
index 1627212..ff69e8f 100644
--- a/src/lib/ktoblzcheck.cc
+++ b/src/lib/ktoblzcheck.cc
@@ -450,15 +450,14 @@ static StringList all_filenames_from_dir(const std::string& dir, bool print_erro
 #ifdef HAVE_WINDOWS_H
     HANDLE hFind = INVALID_HANDLE_VALUE;
     WIN32_FIND_DATA ffd;
-    hFind = FindFirstFile(dir.c_str(), &ffd);
+    std::string mydir = dir + "\\*";
+    hFind = FindFirstFile(mydir.c_str(), &ffd);
     // List all the files in the directory with some info about them.
 
     do
     {
         if (ffd.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)
-        {
-            _tprintf(TEXT("  %s   <DIR>\n"), ffd.cFileName);
-        }
+            continue;
         result.push_back(ffd.cFileName);
     }
     while (FindNextFile(hFind, &ffd) != 0);
-- 
2.16.4

Places

File 0001-all_filenames_from_dir-Fix-finding-files-on-Windows.txt of Package mingw32-ktoblzcheck (Revision 9ea1913fa9b42b3472e6e18f6f2de854)

Places