diff options
| -rw-r--r-- | archival/libunarchive/filter_accept_reject_list.c | 4 | ||||
| -rw-r--r-- | archival/libunarchive/find_list_entry.c | 40 | ||||
| -rw-r--r-- | archival/tar.c | 6 | ||||
| -rw-r--r-- | include/unarchive.h | 1 |
4 files changed, 44 insertions, 7 deletions
diff --git a/archival/libunarchive/filter_accept_reject_list.c b/archival/libunarchive/filter_accept_reject_list.c index be56a446f..a3a938c62 100644 --- a/archival/libunarchive/filter_accept_reject_list.c +++ b/archival/libunarchive/filter_accept_reject_list.c @@ -14,14 +14,14 @@ char filter_accept_reject_list(archive_handle_t *archive_handle) { const char *key = archive_handle->file_header->name; - const llist_t *reject_entry = find_list_entry(archive_handle->reject, key); + const llist_t *reject_entry = find_list_entry2(archive_handle->reject, key); const llist_t *accept_entry; /* If the key is in a reject list fail */ if (reject_entry) { return(EXIT_FAILURE); } - accept_entry = find_list_entry(archive_handle->accept, key); + accept_entry = find_list_entry2(archive_handle->accept, key); /* Fail if an accept list was specified and the key wasnt in there */ if ((accept_entry == NULL) && archive_handle->accept) { 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 @@ #include <stdlib.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, FNM_LEADING_DIR) == 0) { - return (list); + if (fnmatch(list->data, filename, 0) == 0) { + 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; } diff --git a/archival/tar.c b/archival/tar.c index 160731ea9..0b5720f3b 100644 --- a/archival/tar.c +++ b/archival/tar.c @@ -545,8 +545,12 @@ static llist_t *append_file_list_to_list(llist_t *list) tmp = cur; cur = cur->link; free(tmp); - while ((line = bb_get_chomped_line_from_file(src_stream)) != NULL) + while ((line = bb_get_chomped_line_from_file(src_stream)) != NULL) { + char *filename_ptr = last_char_is(line, '/'); + if (filename_ptr > line) + *filename_ptr = '\0'; llist_add_to(&newlist, line); + } fclose(src_stream); } return newlist; diff --git a/include/unarchive.h b/include/unarchive.h index 1dbbc009d..653cff80f 100644 --- a/include/unarchive.h +++ b/include/unarchive.h @@ -98,6 +98,7 @@ extern ssize_t archive_xread_all_eof(archive_handle_t *archive_handle, unsigned extern void data_align(archive_handle_t *archive_handle, const unsigned short boundary); extern const llist_t *find_list_entry(const llist_t *list, const char *filename); +extern const llist_t *find_list_entry2(const llist_t *list, const char *filename); extern int uncompressStream(int src_fd, int dst_fd); extern void inflate_init(unsigned int bufsize); |