style fix (stray space before ';')

[oweals/busybox.git] / archival / libunarchive / find_list_entry.c

diff --git a/archival/libunarchive/find_list_entry.c b/archival/libunarchive/find_list_entry.c
index 49bdd2d098ccec15353e2751a5fd6eba7489a65f..f2741039d14b6f4c62c44b3c8efadfc7e078456b 100644 (file)
--- a/archival/libunarchive/find_list_entry.c
+++ b/archival/libunarchive/find_list_entry.c
@@ -6,17 +6,49 @@
  */
 
 #include <fnmatch.h>
-#include <stdlib.h>
+#include "libbb.h"
 #include "unarchive.h"
 
-/* Find a string in a list */
+/* Find a string in a shell pattern list */
 const llist_t *find_list_entry(const llist_t *list, const char *filename)
 {
        while (list) {
                if (fnmatch(list->data, filename, 0) == 0) {
-                       return (list);
+                       return list;
                }
                list = list->link;
        }
-       return(NULL);
+       return NULL;
+}
+
+/* Same, but compares only path components present in pattern
+ * (extra trailing path components in filename are assumed to match)
+ */
+const llist_t *find_list_entry2(const llist_t *list, const char *filename)
+{
+       char buf[PATH_MAX];
+       int pattern_slash_cnt;
+       const char *c;
+       char *d;
+
+       while (list) {
+               c = list->data;
+               pattern_slash_cnt = 0;
+               while (*c)
+                       if (*c++ == '/') pattern_slash_cnt++;
+               c = filename;
+               d = buf;
+               /* paranoia is better that buffer overflows */
+               while (*c && d != buf + sizeof(buf)-1) {
+                       if (*c == '/' && --pattern_slash_cnt < 0)
+                               break;
+                       *d++ = *c++;
+               }
+               *d = '\0';
+               if (fnmatch(list->data, buf, 0) == 0) {
+                       return list;
+               }
+               list = list->link;
+       }
+       return NULL;
 }