feat: support extracting multiple files in one call

Author: bdrung

man/3cpio.1.adoc

@@ -22,7 +22,7 @@ Benjamin Drung
 *3cpio* {*-t*|*--list*} [*-v*|*--debug*] [*-P* _LIST_] _ARCHIVE_ [_pattern_...]
 
 *3cpio* {*-x*|*--extract*} [*-v*|*--debug*] [*-C* _DIR_] [*-P* _LIST_] [*-p*] [*-s* _NAME_]
-[*--to-stdout*] [*--force*] _ARCHIVE_ [_pattern_...]
+[*--to-stdout*] [*--force*] [*-f*] _ARCHIVE_ [*-f* _ARCHIVE_...] [_pattern_...]
 
 *3cpio* {*-V*|*--version*}
 
@@ -74,8 +74,10 @@ Following compression formats are supported: bzip2, gzip, lz4, lzma, lzop, xz, z
   matching at least one of those __pattern__s.
   These __pattern__s are shell wildcard patterns (see *glob*(7)).
 
-*-x*, *--extract* _ARCHIVE_ [_pattern_...]::
+*-x*, *--extract* [-f] _ARCHIVE_ [-f _ARCHIVE_] [_pattern_...]::
   Extract cpio archives.
+  Multiple archives can be specified with *-f*.
+  The option *-f* can be omitted for the first archive.
   If one or more __pattern__s are supplied, extract only files
   matching at least one of those __pattern__s.
   These __pattern__s are shell wildcard patterns (see *glob*(7)).

src/main.rs

@@ -28,7 +28,7 @@ struct Args {
     force: bool,
     list: bool,
     log_level: Level,
-    archive: Option<String>,
+    archives: Vec<String>,
     make_directories: bool,
     parts: Option<Ranges>,
     patterns: Vec<Pattern>,
@@ -58,7 +58,8 @@ fn print_help() {
     {executable} {{-c|--create}} [-v|--debug] [-C DIR] [--data-align BYTES] [ARCHIVE] < manifest
     {executable} {{-e|--examine}} [--raw] ARCHIVE
     {executable} {{-t|--list}} [-v|--debug] [-P LIST] ARCHIVE [pattern...]
-    {executable} {{-x|--extract}} [-v|--debug] [-C DIR] [--make-directories] [-P LIST] [-p] [-s NAME] [--to-stdout] [--force] ARCHIVE [pattern...]
+    {executable} {{-x|--extract}} [-v|--debug] [-C DIR] [--make-directories] [-P LIST] \
+                 [-p] [-s NAME] [--to-stdout] [--force] [-f] ARCHIVE [-f ARCHIVE...] [pattern...]
 
 Optional arguments:
   --count        Print the number of concatenated cpio archives.
@@ -103,7 +104,7 @@ fn parse_args() -> Result<Args, lexopt::Error> {
     let mut list = 0;
     let mut log_level = Level::Warning;
     let mut directory = ".".into();
-    let mut archive = None;
+    let mut archives = Vec::new();
     let mut make_directories = false;
     let mut patterns = Vec::new();
     let mut raw = false;
@@ -179,8 +180,11 @@ fn parse_args() -> Result<Args, lexopt::Error> {
             Short('x') | Long("extract") => {
                 extract = 1;
             }
-            Value(val) if archive.is_none() => {
-                archive = Some(val.string()?);
+            Short('f') => {
+                archives.push(parser.value()?.string()?);
+            }
+            Value(val) if archives.is_empty() => {
+                archives.push(val.string()?);
             }
             Value(val) => arguments.push(val.string()?),
             _ => return Err(arg.unexpected()),
@@ -210,9 +214,12 @@ fn parse_args() -> Result<Args, lexopt::Error> {
         }
     }
 
-    if create != 1 && archive.is_none() {
+    if create != 1 && archives.is_empty() {
         return Err("missing argument ARCHIVE".into());
     }
+    if extract != 1 && archives.len() > 1 {
+        return Err("specifying multiple -f ARCHIVE is only supported for --extract".into());
+    }
 
     Ok(Args {
         count: count == 1,
@@ -224,7 +231,7 @@ fn parse_args() -> Result<Args, lexopt::Error> {
         force,
         list: list == 1,
         log_level,
-        archive,
+        archives,
         make_directories,
         parts,
         patterns,
@@ -342,7 +349,7 @@ fn main() -> ExitCode {
 
     if args.create {
         let mut archive = None;
-        if let Some(path) = args.archive.as_ref() {
+        if let Some(path) = args.archives.first() {
             archive = match File::create(path) {
                 Ok(f) => Some(f),
                 Err(e) => {
@@ -368,7 +375,7 @@ fn main() -> ExitCode {
                 _ => {
                     eprintln!(
                         "{executable}: Error: Failed to create '{}': {error}",
-                        args.archive.unwrap_or("cpio on stdout".into()),
+                        args.archives.first().unwrap_or(&"cpio on stdout".into()),
                     );
                     return ExitCode::FAILURE;
                 }
@@ -377,16 +384,17 @@ fn main() -> ExitCode {
         return ExitCode::SUCCESS;
     };
 
-    let archive = match File::open(args.archive.as_ref().unwrap()) {
-        Ok(f) => f,
-        Err(e) => {
-            eprintln!(
-                "{executable}: Error: Failed to open '{}': {e}",
-                args.archive.unwrap(),
-            );
-            return ExitCode::FAILURE;
-        }
-    };
+    let mut opened_archives = Vec::new();
+    for path in &args.archives {
+        let archive = match File::open(path) {
+            Ok(f) => f,
+            Err(e) => {
+                eprintln!("{executable}: Error: Failed to open '{path}': {e}");
+                return ExitCode::FAILURE;
+            }
+        };
+        opened_archives.push((path.clone(), archive));
+    }
 
     if args.extract && !args.to_stdout {
         if let Err(e) = create_and_set_current_dir(&args.directory, args.force) {
@@ -402,16 +410,15 @@ fn main() -> ExitCode {
             return ExitCode::FAILURE;
         }
     };
-    let (operation, result) = operate_on_archive(archive, &args, &cwd, &mut logger);
-    if let Err(e) = result {
-        match e.kind() {
-            ErrorKind::BrokenPipe => {}
-            _ => {
-                eprintln!(
-                    "{executable}: Error: Failed to {operation} of '{}': {e}",
-                    args.archive.as_deref().unwrap(),
-                );
-                return ExitCode::FAILURE;
+    for (path, archive) in opened_archives {
+        let (operation, result) = operate_on_archive(archive, &args, &cwd, &mut logger);
+        if let Err(e) = result {
+            match e.kind() {
+                ErrorKind::BrokenPipe => break,
+                _ => {
+                    eprintln!("{executable}: Error: Failed to {operation} of '{path}': {e}");
+                    return ExitCode::FAILURE;
+                }
             }
         }
     }

tests/cli.rs

@@ -390,6 +390,29 @@ fn test_examine_single_cpio_raw() -> Result<(), Box<dyn Error>> {
     Ok(())
 }
 
+#[test]
+fn test_extract_multiple() -> Result<(), Box<dyn Error>> {
+    let tempdir = TempDir::new()?;
+    let mut cmd = get_command();
+    cmd.arg("-x")
+        .arg("-C")
+        .arg(&tempdir.path)
+        .arg("-v")
+        .arg("-f")
+        .arg("tests/single.cpio")
+        .arg("-f")
+        .arg("tests/shell.cpio");
+
+    println!("tempdir = {:?}", tempdir.path);
+    cmd.output()?
+        .assert_stderr(".\npath\npath/file\n.\nusr\nusr/bin\nusr/bin/sh\n")
+        .assert_success()
+        .assert_stdout("");
+    assert!(tempdir.path.join("path/file").exists());
+    assert!(tempdir.path.join("usr/bin/sh").exists());
+    Ok(())
+}
+
 #[test]
 fn test_extract_to_stdout() -> Result<(), Box<dyn Error>> {
     let mut cmd = get_command();