Revert "toybox: find: Fix segfault when using -iname/-ipath with -exec"

[android-x86/external-toybox.git] / toys / posix / find.c

diff --git a/toys/posix/find.c b/toys/posix/find.c
index 4c7e864..303aada 100644 (file)
--- a/toys/posix/find.c
+++ b/toys/posix/find.c
@@ -315,21 +315,22 @@ static int do_find(struct dirtree *new)
         || !strcmp(s, "path") || !strcmp(s, "ipath"))
       {
         int i = (*s == 'i');
-
-        if (i && !new) {
-            char *p;
-            for (p = ss[1]; *p; ++p) {
-                *p = tolower(*p);
-            }
+        char *arg = ss[1], *path = 0, *name = new ? new->name : arg;
+
+        // Handle path expansion and case flattening
+        if (new && s[i] == 'p') name = path = dirtree_path(new, 0);
+        if (i) {
+          if (check || !new) {
+            if (name) name = strlower(name);
+            if (!new) {
+              dlist_add(&TT.argdata, name);
+              free(path);
+            } else arg = ((struct double_list *)llist_pop(&argdata))->data;
+          }
         }
-        if (check) {
-          char *path = 0, *name = new->name;
-
-          // Handle path expansion and case flattening
-          if (s[i] == 'p') name = path = dirtree_path(new, 0);
-          if (i) name = strlower(name);
 
-          test = !fnmatch(ss[1], name, FNM_PATHNAME*(s[i] == 'p'));
+        if (check) {
+          test = !fnmatch(arg, name, FNM_PATHNAME*(s[i] == 'p'));
           free(path);
           if (i) free(name);
         }