aboutsummaryrefslogtreecommitdiff
path: root/archival/libunarchive/find_list_entry.c
diff options
context:
space:
mode:
Diffstat (limited to 'archival/libunarchive/find_list_entry.c')
-rw-r--r--archival/libunarchive/find_list_entry.c40
1 files changed, 36 insertions, 4 deletions
diff --git a/archival/libunarchive/find_list_entry.c b/archival/libunarchive/find_list_entry.c
index 57ffec6ec..d1afc72ce 100644
--- a/archival/libunarchive/find_list_entry.c
+++ b/archival/libunarchive/find_list_entry.c
@@ -9,14 +9,46 @@
9#include <stdlib.h> 9#include <stdlib.h>
10#include "unarchive.h" 10#include "unarchive.h"
11 11
12/* Find a string in a list */ 12/* Find a string in a shell pattern list */
13const llist_t *find_list_entry(const llist_t *list, const char *filename) 13const llist_t *find_list_entry(const llist_t *list, const char *filename)
14{ 14{
15 while (list) { 15 while (list) {
16 if (fnmatch(list->data, filename, FNM_LEADING_DIR) == 0) { 16 if (fnmatch(list->data, filename, 0) == 0) {
17 return (list); 17 return list;
18 } 18 }
19 list = list->link; 19 list = list->link;
20 } 20 }
21 return(NULL); 21 return NULL;
22}
23
24/* Same, but compares only path components present in pattern
25 * (extra trailing path components in filename are assumed to match)
26 */
27const llist_t *find_list_entry2(const llist_t *list, const char *filename)
28{
29 char buf[PATH_MAX];
30 int pattern_slash_cnt;
31 const char *c;
32 char *d;
33
34 while (list) {
35 c = list->data;
36 pattern_slash_cnt = 0;
37 while (*c)
38 if (*c++ == '/') pattern_slash_cnt++;
39 c = filename;
40 d = buf;
41 /* paranoia is better that buffer overflows */
42 while (*c && d != buf + sizeof(buf)-1) {
43 if (*c == '/' && --pattern_slash_cnt < 0)
44 break;
45 *d++ = *c++;
46 }
47 *d = '\0';
48 if (fnmatch(list->data, buf, 0) == 0) {
49 return list;
50 }
51 list = list->link;
52 }
53 return NULL;
22} 54}