From 8287218a8ebb9b3c858aeb2cbe6c9a13b9b58a63 Mon Sep 17 00:00:00 2001
From: Scott Cantor <cantor.2@osu.edu>
Date: Wed, 28 Sep 2011 02:54:31 +0000
Subject: [PATCH] Ignore . and .. on Windows side, fix VS make

---
 saml/saml.vcxproj                                   | 1 +
 saml/saml.vcxproj.filters                           | 3 +++
 saml/saml2/metadata/impl/FolderMetadataProvider.cpp | 3 ++-
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/saml/saml.vcxproj b/saml/saml.vcxproj
index e960c5f..0605a5b 100644
--- a/saml/saml.vcxproj
+++ b/saml/saml.vcxproj
@@ -177,6 +177,7 @@
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="saml2\metadata\impl\DiscoverableMetadataProvider.cpp" />
+    <ClCompile Include="saml2\metadata\impl\FolderMetadataProvider.cpp" />
     <ClCompile Include="SAMLConfig.cpp" />
     <ClCompile Include="util\CommonDomainCookie.cpp" />
     <ClCompile Include="util\SAMLConstants.cpp" />
diff --git a/saml/saml.vcxproj.filters b/saml/saml.vcxproj.filters
index 5bf3d4d..bc1143d 100644
--- a/saml/saml.vcxproj.filters
+++ b/saml/saml.vcxproj.filters
@@ -363,6 +363,9 @@
     <ClCompile Include="version.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="saml2\metadata\impl\FolderMetadataProvider.cpp">
+      <Filter>Source Files\saml2\metadata\impl</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="Assertion.h">
diff --git a/saml/saml2/metadata/impl/FolderMetadataProvider.cpp b/saml/saml2/metadata/impl/FolderMetadataProvider.cpp
index 5f89856..1203d31 100644
--- a/saml/saml2/metadata/impl/FolderMetadataProvider.cpp
+++ b/saml/saml2/metadata/impl/FolderMetadataProvider.cpp
@@ -100,7 +100,8 @@ namespace opensaml {
             }
             do {
                 if (f.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) {
-                    log.warn("nested folders not supported, skipping (%s)", f.cFileName);
+                    if (strcmp(f.cFileName, ".") && strcmp(f.cFileName, ".."))
+                        log.warn("nested folders not supported, skipping (%s)", f.cFileName);
                     continue;
                 }
                 fullname = loc + '/' + f.cFileName;
-- 
2.1.4