summaryrefslogtreecommitdiff
path: root/libbb/unarchive.c
diff options
context:
space:
mode:
authorGlenn L McGrath2001-10-13 19:43:46 +0000
committerGlenn L McGrath2001-10-13 19:43:46 +0000
commit4bef7b41861f02874bce4ac6ab0c8c2484d41d07 (patch)
tree68cc6368c5bdca2b2d34213bc66b978fd7a26b03 /libbb/unarchive.c
parent051eee6ed3056145edeee14d7ab4de9e2f723164 (diff)
downloadbusybox-4bef7b41861f02874bce4ac6ab0c8c2484d41d07.zip
busybox-4bef7b41861f02874bce4ac6ab0c8c2484d41d07.tar.gz
unarchive function changed to support both exclude and include lists, applets that use unarchive changed to match.
Diffstat (limited to 'libbb/unarchive.c')
-rw-r--r--libbb/unarchive.c35
1 files changed, 18 insertions, 17 deletions
diff --git a/libbb/unarchive.c b/libbb/unarchive.c
index 37ab67a..9c599a4 100644
--- a/libbb/unarchive.c
+++ b/libbb/unarchive.c
@@ -230,35 +230,36 @@ char *extract_archive(FILE *src_stream, FILE *out_stream, const file_header_t *f
#ifdef L_unarchive
char *unarchive(FILE *src_stream, FILE *out_stream, file_header_t *(*get_headers)(FILE *),
- const int extract_function, const char *prefix, char **extract_names)
+ const int extract_function, const char *prefix, char **include_name, char **exclude_name)
{
file_header_t *file_entry;
- int extract_flag;
+ int extract_flag = TRUE;
int i;
char *buffer = NULL;
archive_offset = 0;
while ((file_entry = get_headers(src_stream)) != NULL) {
- extract_flag = TRUE;
- if (extract_names != NULL) {
- int found_flag = FALSE;
- for(i = 0; extract_names[i] != 0; i++) {
- if (fnmatch(extract_names[i], file_entry->name, FNM_LEADING_DIR) == 0) {
- found_flag = TRUE;
+
+ if (include_name != NULL) {
+ extract_flag = FALSE;
+ for(i = 0; include_name[i] != 0; i++) {
+ if (fnmatch(include_name[i], file_entry->name, FNM_LEADING_DIR) == 0) {
+ extract_flag = TRUE;
break;
}
}
- if (extract_function & extract_exclude_list) {
- if (found_flag == TRUE) {
- extract_flag = FALSE;
- }
- } else {
- /* If its not found in the include list dont extract it */
- if (found_flag == FALSE) {
+ } else {
+ extract_flag = TRUE;
+ }
+
+ /* If the file entry is in the exclude list dont extract it */
+ if (exclude_name != NULL) {
+ for(i = 0; exclude_name[i] != 0; i++) {
+ if (fnmatch(exclude_name[i], file_entry->name, FNM_LEADING_DIR) == 0) {
extract_flag = FALSE;
+ break;
}
}
-
}
if (extract_flag == TRUE) {
@@ -607,7 +608,7 @@ char *deb_extract(const char *package_filename, FILE *out_stream,
/* open a stream of decompressed data */
uncompressed_stream = gz_open(deb_stream, &gunzip_pid);
archive_offset = 0;
- output_buffer = unarchive(uncompressed_stream, out_stream, get_header_tar, extract_function, prefix, file_list);
+ output_buffer = unarchive(uncompressed_stream, out_stream, get_header_tar, extract_function, prefix, file_list, NULL);
}
seek_sub_file(deb_stream, ar_header->size);
free(ar_header->name);