Merge "Fix length of pattern." DO NOT MERGE.

Ying Wang · ralf-at-android · commit 98a0607a314a · 2012-05-24T11:07:14.000-07:00
After skipping * with "token++", the length should decrease by 1 as well. (merged from 996b073) Change-Id: Ie6232ef603bb31e25e03b926e6c1bb92ac34902d
diff --git a/tools/aapt/AaptAssets.cpp b/tools/aapt/AaptAssets.cpp
@@ -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;
             }

Original file line number	Diff line number	Diff line change
`@@ -122,6 +122,7 @@ static bool isHidden(const char root, const char path)`
`122`	`122`	`if (token[0] == '*') {`
`123`	`123`	`// Match *suffix`
`124`	`124`	`token++;`
	`125`	`+ n--;`
`125`	`126`	`if (n <= plen) {`
`126`	`127`	`ignore = strncasecmp(token, path + plen - n, n) == 0;`
`127`	`128`	`}`