Cargo.toml

@@ -18,13 +18,10 @@ license = "GPL-3.0-or-later"
 #
 # # Logging
 # Tracing can be disabled at compile-time for higher performance by disabling the `logging` feature (see above, but remove `,logging` from the features.)
-default = ["mode-memfile", "mode-flags", "logging"]
+default = ["mode-memfile", "logging"]
 
 ## --- Modes --- ##
 
-# Enable all flag options
-mode-flags = ["exec"]
-
 # Mode: default
 # Use physical-memory backed kernel file-descriptors. (see feature `memfile`.)
 mode-memfile = ["memfile"] #, "tracing/release_max_level_warn"]
@@ -35,9 +32,6 @@ mode-buffered = ["jemalloc", "bytes"]
 
 ## --- Individual features --- ##
 
-# Enable `-exec/{}` flag options
-exec = []
-
 # Use an in-memory file for storage instead of a byte-buffer.
 #
 # This can draastically improve performance as it allows for the use of `splice()` and `send_file()` syscalls instead of many `read()` and `write()` ones.

src/main.rs

@@ -87,7 +87,6 @@ use sys::{
     tell_file,
 };
 
-#[cfg(feature="exec")] 
 mod exec;
 
 mod buffers;
@@ -601,20 +600,15 @@ fn main() -> errors::DispersedResult<()> {
     if_trace!(debug!("initialised"));
 
     //TODO: How to cleanly feature-gate `args`?
-    
+    let opt = {
-    let opt = { cfg_if!{
+	#[cfg(feature="logging")]
-	if #[cfg(feature="exec")] {
+	let _span = debug_span!("args");
-	    #[cfg(feature="logging")]
+	#[cfg(feature="logging")]
-	    let _span = debug_span!("args");
+	let _in_span = _span.enter();
-	    #[cfg(feature="logging")]
+	let parsed = parse_args()?;
-	    let _in_span = _span.enter();
+	if_trace!(debug!("Parsed arguments: {parsed:?}"));
-	    let parsed = parse_args()?;
+	parsed
-	    if_trace!(debug!("Parsed arguments: {parsed:?}"));
+    };
-	    parsed
-	} else {
-	    ()
-	}
-    } };
 
     //TODO: maybe look into fd SEALing? Maybe we can prevent a consumer process from reading from stdout until we've finished the transfer. The name SEAL sounds like it might have something to do with that?
     let execfile;
@@ -627,25 +621,17 @@ fn main() -> errors::DispersedResult<()> {
 		.wrap_err("Operation failed").with_note(|| "Strategy was `buffered`")?;
 	}
     }
-    // Transfer complete, run exec if enabled
+    // Transfer complete, run exec.
-    
+    let rc = if let Some(file) = execfile.get_exec_file() {
-    let rc = { cfg_if! {
+	exec::spawn_from_sync(&file, opt).into_iter().try_fold(0i32, |opt, res| res.map(|x| opt | x.unwrap_or(0)))
-	if #[cfg(feature="exec")] {
+    } else {
-	    let rc = if let Some(file) = execfile.get_exec_file() {
+	if_trace!(debug!("there is no file to apply potential -exec/{{}} to"));
-		exec::spawn_from_sync(&file, opt).into_iter().try_fold(0i32, |opt, res| res.map(|x| opt | x.unwrap_or(0)))
+	Ok(0i32)
-	    } else {
+    }.wrap_err("-exec/{} operations failed")?;
-		if_trace!(debug!("there is no file to apply potential -exec/{{}} to"));
+    if_trace!(match rc {
-		Ok(0i32)
+	0 => trace!("-exec/{{}} operation(s all) returned 0 exit status"),
-	    }.wrap_err("-exec/{} operations failed")?;
+	n => error!("-exec/{{}} operation(s) returned non-zero exit code (total: {}) or were killed by signal", n),
-	    if_trace!(match rc {
+    });
-		0 => trace!("-exec/{{}} operation(s all) returned 0 exit status"),
-		n => error!("-exec/{{}} operation(s) returned non-zero exit code (total: {}) or were killed by signal", n),
-	    });
-	    rc
-	} else {
-	    0i32
-	}
-    } };
 
     // Now that transfer is complete from buffer to `stdout`, close `stdout` pipe before exiting process.
     if_trace!(info!("Transfer complete, closing `stdout` pipe"));
@@ -658,9 +644,7 @@ fn main() -> errors::DispersedResult<()> {
     }.wrap_err(eyre!("Failed to close stdout"))?;
 
     if rc != 0 {
-	if cfg!(feature="exec") {
+	if_trace!(error!("Exiting with non-zero code due to child(s) returning non-zero exit status")); //TODO: A flag to disable this? TODO: Also, a flag to stop printing to stdout so consumers of output can use just `-exec/{}` child process `stdout`s is enabled 
-	    if_trace!(error!("Exiting with non-zero code due to child(s) returning non-zero exit status")); //TODO: A runtime flag to disable this? TODO: Also, a flag to stop printing to stdout so consumers of output can use just `-exec/{}` child process `stdout`s is enabled
-	}
 	std::process::exit(rc);
     }