X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=archival%2Flibunarchive%2Ffind_list_entry.c;h=f2741039d14b6f4c62c44b3c8efadfc7e078456b;hb=b71c668c577f7780362f7ea632895c11e3760d66;hp=49bdd2d098ccec15353e2751a5fd6eba7489a65f;hpb=6b4377f3337d7d3e21e63aa1341d33fd51c2f97c;p=oweals%2Fbusybox.git

diff --git a/archival/libunarchive/find_list_entry.c b/archival/libunarchive/find_list_entry.c
index 49bdd2d09..f2741039d 100644
--- 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;
 }