From ca624dc184d7dc5991c67d6dc0b11e3337f37b34 Mon Sep 17 00:00:00 2001 From: kichik Date: Fri, 26 Nov 2004 20:28:18 +0000 Subject: [PATCH] use stat to find out if the file is a directory or not since it's more portable git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@3790 212acab6-be3b-0410-9dea-997c60f758d6 --- Source/dirreader.cpp | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/Source/dirreader.cpp b/Source/dirreader.cpp index a7493758..4cdbf781 100644 --- a/Source/dirreader.cpp +++ b/Source/dirreader.cpp @@ -169,6 +169,7 @@ public: #else +#include #include #include @@ -182,10 +183,15 @@ public: if (dip) { dirent *dit; while ((dit = ::readdir(dip))) { - if (dit->d_type == DT_DIR) { - dir_reader::add_dir(dit->d_name); - } else { - dir_reader::add_file(dit->d_name); + struct stat st; + string file = dir + PLATFORM_PATH_SEPARATOR_STR + dit->d_name; + + if (!stat(file.c_str(), &st)) { + if (S_ISDIR(st.st_mode)) { + dir_reader::add_dir(dit->d_name); + } else { + dir_reader::add_file(dit->d_name); + } } } ::closedir(dip);