am c1c55afb: am e67f8c8c: Merge "Normalize output from aapt d xmltree"

[android/aapt.git] / AaptAssets.cpp

diff --git a/AaptAssets.cpp b/AaptAssets.cpp
index 73705ae54ba1fa2589494de8fa0f5c28abb3d8c3..46b8a274b1af2dfccfcc782dfe66afcf4d483310 100644 (file)
--- a/AaptAssets.cpp
+++ b/AaptAssets.cpp
@@ -58,7 +58,7 @@ static bool validateFileName(const char* fileName)
 
 // The default to use if no other ignore pattern is defined.
 const char * const gDefaultIgnoreAssets =
 
 // The default to use if no other ignore pattern is defined.
 const char * const gDefaultIgnoreAssets =

-    "!.svn:!.git:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*.scc:*~";
+    "!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~";

 // The ignore pattern that can be passed via --ignore-assets in Main.cpp
 const char * gUserIgnoreAssets = NULL;
 
 // The ignore pattern that can be passed via --ignore-assets in Main.cpp
 const char * gUserIgnoreAssets = NULL;
 


@@ -122,6 +122,7 @@ static bool isHidden(const char *root, const char *path)
         if (token[0] == '*') {
             // Match *suffix
             token++;
         if (token[0] == '*') {
             // Match *suffix
             token++;

+            n--;

             if (n <= plen) {
                 ignore = strncasecmp(token, path + plen - n, n) == 0;
             }
             if (n <= plen) {
                 ignore = strncasecmp(token, path + plen - n, n) == 0;
             }