unarchive function changed to support both exclude and include lists, applets that...

diff --git a/ar.c b/ar.c
index 7f3396c8cf9af0fc8f17096eb59191b1359622ed..e02b2651efc2f03b83a608d73af25a70b3923311 100644 (file)
--- a/ar.c
+++ b/ar.c
@@ -84,6 +84,6 @@ extern int ar_main(int argc, char **argv)
                optind++;
        }
 
-       unarchive(src_stream, stdout, &get_header_ar, extract_function, "./", extract_names);
+       unarchive(src_stream, stdout, &get_header_ar, extract_function, "./", extract_names, NULL);
        return EXIT_SUCCESS;
 }

diff --git a/archival/ar.c b/archival/ar.c
index 7f3396c8cf9af0fc8f17096eb59191b1359622ed..e02b2651efc2f03b83a608d73af25a70b3923311 100644 (file)
--- a/archival/ar.c
+++ b/archival/ar.c
@@ -84,6 +84,6 @@ extern int ar_main(int argc, char **argv)
                optind++;
        }
 
-       unarchive(src_stream, stdout, &get_header_ar, extract_function, "./", extract_names);
+       unarchive(src_stream, stdout, &get_header_ar, extract_function, "./", extract_names, NULL);
        return EXIT_SUCCESS;
 }

diff --git a/archival/cpio.c b/archival/cpio.c
index 7f68715eb4cdec19026dd58ff24f97c52429ba9e..372f9f5b1ebf0784e1d1ef4caa3bcaf29199aab9 100644 (file)
--- a/archival/cpio.c
+++ b/archival/cpio.c
@@ -86,7 +86,7 @@ extern int cpio_main(int argc, char **argv)
                optind++;
        }
 
-       unarchive(src_stream, stdout, &get_header_cpio, extract_function, "./", extract_names);
+       unarchive(src_stream, stdout, &get_header_cpio, extract_function, "./", extract_names, NULL);
        if (oldmask) {
                umask(oldmask); /* Restore umask if we changed it */
        }

diff --git a/archival/tar.c b/archival/tar.c
index 1f8eb4bcb4781d2e41cf53b6f5d1e8fa73829d9c..f7a3da66fe3e402886772c8ce8da49bddfd1ccf1 100644 (file)
--- a/archival/tar.c
+++ b/archival/tar.c
@@ -580,15 +580,10 @@ int tar_main(int argc, char **argv)
                untar_extract = 32
        };
 
-#ifdef BB_FEATURE_TAR_EXCLUDE
-       char **exclude_list = NULL;
-       int exclude_list_count = 0;
-#endif
-
        FILE *src_stream = NULL;
        FILE *uncompressed_stream = NULL;
        char **include_list = NULL;
-       char **the_real_list = NULL;
+       char **exclude_list = NULL;
        char *src_filename = NULL;
        char *dst_prefix = NULL;
        char *file_list_name = NULL;
@@ -597,6 +592,7 @@ int tar_main(int argc, char **argv)
        unsigned short untar_funct_required = 0;
        unsigned short extract_function = 0;
        int include_list_count = 0;
+       int exclude_list_count = 0;
        int gunzip_pid;
        int gz_fd = 0;
 
@@ -691,25 +687,6 @@ int tar_main(int argc, char **argv)
                optind++;
        }
 
-       /* By default the include list is the list we act on */
-       the_real_list = include_list;
-
-#ifdef BB_FEATURE_TAR_EXCLUDE
-       if (exclude_list != NULL) {
-               if (include_list == NULL) {
-                       /* the_real_list is an exclude list */
-                       extract_function |= extract_exclude_list;
-                       the_real_list = exclude_list;
-               } else {
-                       /* Both an exclude and include file list was present,
-                        * its an exclude from include list only.
-                        * Remove excluded files from the include list
-                        */
-                       the_real_list = list_and_not_list(include_list, exclude_list);
-               }
-       }
-#endif
-
        if (extract_function & (extract_list | extract_all_to_fs)) {
                if (dst_prefix == NULL) {
                        dst_prefix = xstrdup("./");
@@ -730,7 +707,7 @@ int tar_main(int argc, char **argv)
                        uncompressed_stream = src_stream;
                
                /* extract or list archive */
-               unarchive(uncompressed_stream, stdout, &get_header_tar, extract_function, dst_prefix, the_real_list);
+               unarchive(uncompressed_stream, stdout, &get_header_tar, extract_function, dst_prefix, include_list, exclude_list);
                fclose(uncompressed_stream);
        }
 #ifdef BB_FEATURE_TAR_CREATE
@@ -746,7 +723,7 @@ int tar_main(int argc, char **argv)
                if (extract_function & extract_verbose_list) {
                        verboseFlag = TRUE;
                }
-               writeTarFile(src_filename, verboseFlag, &argv[argc - 1], the_real_list);
+               writeTarFile(src_filename, verboseFlag, &argv[argc - 1], include_list);
        }
 #endif // BB_FEATURE_TAR_CREATE
 

diff --git a/cpio.c b/cpio.c
index 7f68715eb4cdec19026dd58ff24f97c52429ba9e..372f9f5b1ebf0784e1d1ef4caa3bcaf29199aab9 100644 (file)
--- a/cpio.c
+++ b/cpio.c
@@ -86,7 +86,7 @@ extern int cpio_main(int argc, char **argv)
                optind++;
        }
 
-       unarchive(src_stream, stdout, &get_header_cpio, extract_function, "./", extract_names);
+       unarchive(src_stream, stdout, &get_header_cpio, extract_function, "./", extract_names, NULL);
        if (oldmask) {
                umask(oldmask); /* Restore umask if we changed it */
        }

diff --git a/include/libbb.h b/include/libbb.h
index bbdbc6c8675b7c5895639a3dc432a7aab8f5d7bb..3ef0278f8584eb0c1a1080a185ebf3f561d34f49 100644 (file)
--- a/include/libbb.h
+++ b/include/libbb.h
@@ -245,8 +245,8 @@ enum extract_functions_e {
        extract_quiet = 2048,
        extract_exclude_list = 4096
 };
-char *unarchive(FILE *src_stream, FILE *out_stream, file_header_t *(*get_header)(FILE *),
-       const int extract_function, const char *prefix, char **extract_names);
+char *unarchive(FILE *src_stream, FILE *out_stream, file_header_t *(*get_headers)(FILE *),
+       const int extract_function, const char *prefix, char **include_name, char **exclude_name);
 char *deb_extract(const char *package_filename, FILE *out_stream, const int extract_function,
        const char *prefix, const char *filename);
 int read_package_field(const char *package_buffer, char **field_name, char **field_value);

diff --git a/libbb/libbb.h b/libbb/libbb.h
index bbdbc6c8675b7c5895639a3dc432a7aab8f5d7bb..3ef0278f8584eb0c1a1080a185ebf3f561d34f49 100644 (file)
--- a/libbb/libbb.h
+++ b/libbb/libbb.h
@@ -245,8 +245,8 @@ enum extract_functions_e {
        extract_quiet = 2048,
        extract_exclude_list = 4096
 };
-char *unarchive(FILE *src_stream, FILE *out_stream, file_header_t *(*get_header)(FILE *),
-       const int extract_function, const char *prefix, char **extract_names);
+char *unarchive(FILE *src_stream, FILE *out_stream, file_header_t *(*get_headers)(FILE *),
+       const int extract_function, const char *prefix, char **include_name, char **exclude_name);
 char *deb_extract(const char *package_filename, FILE *out_stream, const int extract_function,
        const char *prefix, const char *filename);
 int read_package_field(const char *package_buffer, char **field_name, char **field_value);

diff --git a/libbb/unarchive.c b/libbb/unarchive.c
index 37ab67aff59e2951d4c6d29005b9e48b8242bb81..9c599a415a3daa6d23916daff295ea59bd68b7da 100644 (file)
--- 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);

diff --git a/tar.c b/tar.c
index 1f8eb4bcb4781d2e41cf53b6f5d1e8fa73829d9c..f7a3da66fe3e402886772c8ce8da49bddfd1ccf1 100644 (file)
--- a/tar.c
+++ b/tar.c
@@ -580,15 +580,10 @@ int tar_main(int argc, char **argv)
                untar_extract = 32
        };
 
-#ifdef BB_FEATURE_TAR_EXCLUDE
-       char **exclude_list = NULL;
-       int exclude_list_count = 0;
-#endif
-
        FILE *src_stream = NULL;
        FILE *uncompressed_stream = NULL;
        char **include_list = NULL;
-       char **the_real_list = NULL;
+       char **exclude_list = NULL;
        char *src_filename = NULL;
        char *dst_prefix = NULL;
        char *file_list_name = NULL;
@@ -597,6 +592,7 @@ int tar_main(int argc, char **argv)
        unsigned short untar_funct_required = 0;
        unsigned short extract_function = 0;
        int include_list_count = 0;
+       int exclude_list_count = 0;
        int gunzip_pid;
        int gz_fd = 0;
 
@@ -691,25 +687,6 @@ int tar_main(int argc, char **argv)
                optind++;
        }
 
-       /* By default the include list is the list we act on */
-       the_real_list = include_list;
-
-#ifdef BB_FEATURE_TAR_EXCLUDE
-       if (exclude_list != NULL) {
-               if (include_list == NULL) {
-                       /* the_real_list is an exclude list */
-                       extract_function |= extract_exclude_list;
-                       the_real_list = exclude_list;
-               } else {
-                       /* Both an exclude and include file list was present,
-                        * its an exclude from include list only.
-                        * Remove excluded files from the include list
-                        */
-                       the_real_list = list_and_not_list(include_list, exclude_list);
-               }
-       }
-#endif
-
        if (extract_function & (extract_list | extract_all_to_fs)) {
                if (dst_prefix == NULL) {
                        dst_prefix = xstrdup("./");
@@ -730,7 +707,7 @@ int tar_main(int argc, char **argv)
                        uncompressed_stream = src_stream;
                
                /* extract or list archive */
-               unarchive(uncompressed_stream, stdout, &get_header_tar, extract_function, dst_prefix, the_real_list);
+               unarchive(uncompressed_stream, stdout, &get_header_tar, extract_function, dst_prefix, include_list, exclude_list);
                fclose(uncompressed_stream);
        }
 #ifdef BB_FEATURE_TAR_CREATE
@@ -746,7 +723,7 @@ int tar_main(int argc, char **argv)
                if (extract_function & extract_verbose_list) {
                        verboseFlag = TRUE;
                }
-               writeTarFile(src_filename, verboseFlag, &argv[argc - 1], the_real_list);
+               writeTarFile(src_filename, verboseFlag, &argv[argc - 1], include_list);
        }
 #endif // BB_FEATURE_TAR_CREATE