Fix symlink following bug in chmod -R and friends. Allow SYSV style

'chown foo:bar' in addition to 'chown foo.bar', and fix a bug in the
busybox globbing routine such that 'find /dir -name [i]' no longer
segfaults.
 -Erik


git-svn-id: svn://busybox.net/trunk/busybox@478 69ca8d6d-28ef-0310-b511-8ec308f3f277

1 files changed, 11 insertions, 6 deletions

diff --git a/utility.c b/utility.c
index 0045e4d75..773f6a83e 100644
--- a/utility.c
+++ b/utility.c
@@ -1058,6 +1058,7 @@ extern int check_wildcard_match(const char *text, const char *pattern)
         const char *retryText;
         int ch;
         int found;
+        int len;
 
         retryPat = NULL;
         retryText = NULL;
@@ -1084,13 +1085,17 @@ extern int check_wildcard_match(const char *text, const char *pattern)
                                 if (*text == ch)
                                         found = TRUE;
                         }
-                        if (found == FALSE)
-                                continue;
+                        len=strlen(text);
+                        if (found == FALSE && len!=0) {
+                                return FALSE;
+                        }
                         if (found == TRUE) {
-                                //printf("Got a match.  pattern='%s'  text='%s'\n", pattern, text);
-                                if (retryPat || retryText) {
-                                        pattern = retryPat;
-                                        text = ++retryText;
+                                if (strlen(pattern)==0 && len==1) {
+                                        return TRUE;
+                                }
+                                if (len!=0) {
+                                        text++;
+                                        continue;
                                 }
                         }