Fixed extraction bug and additional bugs in cpio plugin

src/binwalk/modules/extractor.py

@@ -106,8 +106,8 @@ class Extractor(Module):
         else:
             size = r.size
 
-        # Only extract valid results    
-        if r.valid:
+        # Only extract valid results marked for extraction    
+        if r.valid and r.extract:
             # Do the extraction
             (extraction_directory, dd_file) = self.extract(r.offset, r.description, r.file.name, size, r.name)
 

src/binwalk/plugins/cpio.py

@@ -24,7 +24,8 @@ class CPIOPlugin(binwalk.core.plugin.Plugin):
                 elif 'TRAILER!!!' in result.description:
                     # This is the last entry, un-set found_archive.
                     self.found_archive = False
-    
-                # The first entry has already been found and this is the last entry, or the last entry 
+                    result.extract = False
+                else:
+                    # The first entry has already been found and this is not the last entry, or the last entry 
                     # has not yet been found. Don't extract.
                     result.extract = False