Ignore . and .. on Windows side, fix VS make

git-svn-id: https://svn.shibboleth.net/cpp-opensaml/branches/REL_2@676 fb386ef7-a10c-0410-8ebf-fd3f8e989ab0

diff --git a/saml/saml.vcxproj b/saml/saml.vcxproj
index e960c5f..0605a5b 100644 (file)
--- a/saml/saml.vcxproj
+++ b/saml/saml.vcxproj
@@ -177,6 +177,7 @@
   </ItemDefinitionGroup>\r
   <ItemGroup>\r
     <ClCompile Include="saml2\metadata\impl\DiscoverableMetadataProvider.cpp" />\r
+    <ClCompile Include="saml2\metadata\impl\FolderMetadataProvider.cpp" />\r
     <ClCompile Include="SAMLConfig.cpp" />\r
     <ClCompile Include="util\CommonDomainCookie.cpp" />\r
     <ClCompile Include="util\SAMLConstants.cpp" />\r

diff --git a/saml/saml.vcxproj.filters b/saml/saml.vcxproj.filters
index 5bf3d4d..bc1143d 100644 (file)
--- a/saml/saml.vcxproj.filters
+++ b/saml/saml.vcxproj.filters
@@ -363,6 +363,9 @@
     <ClCompile Include="version.cpp">\r
       <Filter>Source Files</Filter>\r
     </ClCompile>\r
+    <ClCompile Include="saml2\metadata\impl\FolderMetadataProvider.cpp">\r
+      <Filter>Source Files\saml2\metadata\impl</Filter>\r
+    </ClCompile>\r
   </ItemGroup>\r
   <ItemGroup>\r
     <ClInclude Include="Assertion.h">\r

diff --git a/saml/saml2/metadata/impl/FolderMetadataProvider.cpp b/saml/saml2/metadata/impl/FolderMetadataProvider.cpp
index 5f89856..1203d31 100644 (file)
--- 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;