Changeset 3232 in MondoRescue for branches/3.2/mindi-busybox/archival/libarchive/filter_accept_reject_list.c

Timestamp:

Jan 1, 2014, 12:47:38 AM (10 years ago)

Author:

Bruno Cornec

Message:

• Update mindi-busybox to 1.21.1

File:

• branches/3.2/mindi-busybox/archival/libarchive/filter_accept_reject_list.c (modified) (2 diffs)

branches/3.2/mindi-busybox/archival/libarchive/filter_accept_reject_list.c

@@ -7 +7 @@
 
 #include "libbb.h"
-#include "archive.h"
+#include "bb_archive.h"
 
 /*
@@ -25 +25 @@
         return EXIT_FAILURE;
     }
-    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) {
-        return EXIT_FAILURE;
+    if (archive_handle->accept) {
+        accept_entry = find_list_entry2(archive_handle->accept, key);
+        if (!accept_entry) {
+            return EXIT_FAILURE;
+        }
     }