X-Git-Url: https://git.saurik.com/android/aapt.git/blobdiff_plain/d35357226f49361bd6125654e5cff0bd5cab7556..86001ed2bff0362b580bb1d977e7bf6f9a93815b:/AaptAssets.cpp

diff --git a/AaptAssets.cpp b/AaptAssets.cpp
index 73705ae..46b8a27 100644
--- 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,6 +122,7 @@ 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;
             }