X-Git-Url: https://git.saurik.com/android/aapt.git/blobdiff_plain/8be9f9e93371403dc056f1b13f8b93ff3863eaad..640c141b2e6c59c7b9876c27ab7abadec7723c45:/AaptAssets.cpp diff --git a/AaptAssets.cpp b/AaptAssets.cpp index 7d735ad..012f84e 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:.*:_*:!CVS:!thumbs.db:!picasa.ini:!*.scc:*~"; + "!.svn:!.git:!.ds_store:!*.scc:.*:_*:!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; }