am 9e22d9c5: Merge "Fix "Too many open files" error for aapt built with Mac OS X...

[android/aapt.git] / AaptAssets.cpp

diff --git a/AaptAssets.cpp b/AaptAssets.cpp
index 7d735ad424e6b38889d05b62946c80fe718c6dd9..012f84eb797fe0b3c8bd07330f06fc58c847d8e8 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 =
-    "!.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;
 
@@ -122,7 +122,6 @@ static bool isHidden(const char *root, const char *path)
         if (token[0] == '*') {
             // Match *suffix
             token++;
-            n--;
             if (n <= plen) {
                 ignore = strncasecmp(token, path + plen - n, n) == 0;
             }