From 427e1b9d363a2e3d77997d3dae168e9be2cb5623 Mon Sep 17 00:00:00 2001
From: DTB <trinity@trinity.moe>
Date: Wed, 24 Jul 2024 18:46:05 -0600
Subject: [PATCH] simexec(1): non-functional Rust rewrite

---
 Makefile       |  4 +--
 src/simexec.c  | 34 -------------------------
 src/simexec.rs | 69 ++++++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 71 insertions(+), 36 deletions(-)
 delete mode 100644 src/simexec.c
 create mode 100644 src/simexec.rs

diff --git a/Makefile b/Makefile
index 4fd60c5..c7ac55a 100644
--- a/Makefile
+++ b/Makefile
@@ -134,8 +134,8 @@ build/bin/scrut: src/scrut.c build
 
 .PHONY: simexec
 simexec: build/bin/simexec
-build/bin/simexec: src/simexec.c build
-	$(CC) $(CFLAGS) -o $@ src/simexec.c
+build/bin/simexec: src/simexec.rs build
+	$(RUSTC) $(RUSTFLAGS) $(RUSTLIBS) -o $@ src/simexec.rs
 
 .PHONY: str
 str: build/bin/str
diff --git a/src/simexec.c b/src/simexec.c
deleted file mode 100644
index 6441bdb..0000000
--- a/src/simexec.c
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright (c) 2022–2024 DTB <trinity@trinity.moe>
- * SPDX-License-Identifier: AGPL-3.0-or-later
- *
- * This program is free software: you can redistribute it and/or modify it under
- * the terms of the GNU Affero General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option) any
- * later version.
- * 
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more
- * details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see https://www.gnu.org/licenses/.
- */
-
-#include <stdio.h> /* fprintf(3), NULL */
-#include <unistd.h> /* execv(3), */
-#include <sysexits.h> /* EX_USAGE */
-
-char *program_name = "simexec";
-
-int main(int argc, char *argv[]){
-	if (argc < 2) {
-		fprintf(stderr, "Usage: %s binary argv...\n",
-			argv[0] == NULL ? program_name : argv[0]
-		);
-		return EX_USAGE;
-	}
-
-	execv(argv[1], &argv[2]);
-}
diff --git a/src/simexec.rs b/src/simexec.rs
new file mode 100644
index 0000000..57a5dc7
--- /dev/null
+++ b/src/simexec.rs
@@ -0,0 +1,69 @@
+/*
+ * Copyright (c) 2022–2024 DTB <trinity@trinity.moe>
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ *
+ * This program is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Affero General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option) any
+ * later version.
+ * 
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see https://www.gnu.org/licenses/.
+ */
+
+use std::{
+	env::args,
+	io::Error,
+	os::unix::process::CommandExt,
+	process::{ Command, ExitCode }
+};
+
+extern crate strerror;
+use strerror::StrError;
+
+extern crate sysexits;
+use sysexits::{ EX_UNAVAILABLE, EX_USAGE };
+
+fn error(p: &str, n: &str, e: Error) -> ExitCode {
+	eprintln!("{}: {}: {}", p, n, e.strerror());
+	ExitCode::from(EX_UNAVAILABLE as u8)
+}
+
+fn main() -> ExitCode {
+	let argv = args().collect::<Vec<String>>();
+
+	if argv.len() < 2 {
+		eprintln!("Usage: {} binary argv...", argv[0]);
+		return ExitCode::from(EX_USAGE as u8);
+	}
+
+	let mut cmd = Command::new(argv[1].clone());
+
+	if argv.len() > 2 { cmd.arg0(argv[2].clone()); }
+	if argv.len() > 3 {
+		let cmdargs = argv.iter().clone().skip(3).collect::<Vec<&String>>();
+		cmd.args(cmdargs);
+	}
+
+	match cmd.spawn() {
+		Ok(mut child) => match child.wait() {
+			Ok(status) => {
+				match status.code() {
+					Some(code) => ExitCode::from(code as u8),
+					None => {
+						eprintln!("{}: {}: process terminated by signal",
+							argv[0], argv[2]);
+						ExitCode::FAILURE
+					}
+				}
+			},
+			Err(e) => error(&argv[0], &argv[2], e)
+		},
+		Err(e) => error(&argv[0], &argv[2], e)
+	}
+}