From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 22 May 2022 19:31:12 +0000 (+0100)
Subject: usvg: Refactor code that runs it in bundles.rs
X-Git-Tag: otter-1.1.0~23
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=79c6076a53dea004860bb3b43882a1c681e13fde;p=otter.git

usvg: Refactor code that runs it in bundles.rs

This provides a place to put additional command line options.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

diff --git a/src/bundles.rs b/src/bundles.rs
index 41b08d64..f9c7f47a 100644
--- a/src/bundles.rs
+++ b/src/bundles.rs
@@ -849,9 +849,11 @@ fn make_usvg(instance_name: &str, bundle_name: &str, za: &mut IndexedZip,
       let mut usvg1 = tempfile::tempfile_in(&svg_dir)
         .context("create temporary usvg").map_err(IE::from)?;
 
-      let got = Command::new(&config().usvg_bin).args(&["-","-c"])
+      let mut cmd = Command::new(&config().usvg_bin);
+      cmd.args(&["-","-c"])
         .stdin(input)
-        .stdout(usvg1.try_clone().context("dup usvg1").map_err(IE::from)?)
+        .stdout(usvg1.try_clone().context("dup usvg1").map_err(IE::from)?);
+      let got = cmd
         .output().context("run usvg").map_err(IE::from)?;
       if ! got.status.success() {
         throw!(LE::BadBundle(format!(