dj(1): use entirely-stdio error messages for OpenBSD functions

CONTRIBUTING

@@ -99,9 +99,10 @@ their editor or terminal.
 
 For usage text and help messages, do not implement a -h option. Instead, print
 usage information when any erroneous option is specified. Follow the NetBSD
-style guide for the usage text’s output format [1].
+style guide for the usage text’s output format [0].
 
-[1] <http://cvsweb.netbsd.org/bsdweb.cgi/~checkout~/src/share/misc/style>
+If committing a new utility, please include tests and documentation (see
+tests/ and docs/) for the new tool.
 
 If committing a new source file, format the commit message following these
 guidelines:
@@ -130,6 +131,7 @@ $ git commit -m 'tool(1): fix #42 & add feature x'
 
 Commit messages should be written in the present tense.
 
+[0] <http://cvsweb.netbsd.org/bsdweb.cgi/~checkout~/src/share/misc/style>
 --
 This work © 2023–2024 by Emma Tebibyte is licensed under CC BY-SA 4.0. To view a
 copy of this license, visit <http://creativecommons.org/licenses/by-sa/4.0/>

Makefile

@@ -16,21 +16,31 @@
 DESTDIR ?= dist
 PREFIX ?= /usr/local
 
+# for conditionally compiling OS features
+OS != uname
+OS_INCLUDE != test -e include/$(OS).mk && printf 'include/$(OS).mk\n' \
+	|| include/None.mk
+
 # normalized prefix
-PREFIX_N != (test -d $(PREFIX) && [ '-' != $(PREFIX) ] \
-	&& CDPATH= cd -P -- $(PREFIX) && pwd -P)
-MANDIR != [ $(PREFIX_N) = / ] && printf '/usr/share/man\n' \
+PREFIX_N != dirname $(PREFIX)/.
+MANDIR != test $(PREFIX_N) = / && printf '/usr/share/man\n' \
 	|| printf '/share/man\n'
 SYSEXITS != printf '\043include <sysexits.h>\n' | cpp -M - | tr ' ' '\n' \
 	| sed -n 's/sysexits\.h//p' || printf 'include\n'
 
 CC ?= cc
 RUSTC ?= rustc
-RUSTLIBS = --extern getopt=build/o/libgetopt.rlib \
-	--extern sysexits=build/o/libsysexits.rlib \
-	--extern strerror=build/o/libstrerror.rlib
+RUSTFLAGS += --extern getopt=build/o/libgetopt.rlib \
+	--extern strerror=build/o/libstrerror.rlib \
+	--extern sysexits=build/o/libsysexits.rlib
 CFLAGS += -I$(SYSEXITS)
 
+# testing requires the absolute path to the bin directory set
+BIN = build/bin
+
+.PHONY: default
+default: all test
+
 .PHONY: all
 all: dj false fop hru intcmp mm npc rpn scrut str strcmp swab true
 
@@ -52,10 +62,12 @@ dist: all docs
 install: dist
 	cp -r $(DESTDIR)/* /
 
+include tests/tests.mk
+
 .PHONY: test
-test: build /tmp/getopt
+test: all $(TESTS) /tmp/getopt
+	@echo $(TESTS)
 	/tmp/getopt
-	tests/posix-compat.sh
 
 /tmp/getopt: src/libgetopt.rs
 	$(RUSTC) --test -o /tmp/getopt src/libgetopt.rs
@@ -67,9 +79,12 @@ docs: docs/ build
 		"s/X\.X\.X/$$(git describe --tags --long | cut -d'-' -f1)/g")"; \
 		sed "s/$$original/$$title/g" <"$$file" >"build/$$file"; done
 
+# include OS feature libraries for compilation
+include $(OS_INCLUDE)
+
 .PHONY: rustlibs
-rustlibs: build/o/libsysexits.rlib build/o/libgetopt.rlib \
-	build/o/libstrerror.rlib
+rustlibs: build/o/libgetopt.rlib build/o/libstrerror.rlib \
+	 build/o/libsysexits.rlib $(OSLIB)
 
 build/o/libgetopt.rlib: build src/libgetopt.rs
 	$(RUSTC) $(RUSTFLAGS) --crate-type=lib --crate-name=getopt \
@@ -100,32 +115,32 @@ build/bin/false: src/false.c build
 .PHONY: fop
 fop: build/bin/fop
 build/bin/fop: src/fop.rs build rustlibs
-	$(RUSTC) $(RUSTFLAGS) $(RUSTLIBS) -o $@ src/fop.rs
+	$(RUSTC) $(RUSTFLAGS) -o $@ src/fop.rs
 
 .PHONY: hru
 hru: build/bin/hru
 build/bin/hru: src/hru.rs build rustlibs 
-	$(RUSTC) $(RUSTFLAGS) $(RUSTLIBS) -o $@ src/hru.rs
+	$(RUSTC) $(RUSTFLAGS) -o $@ src/hru.rs
 
 .PHONY: intcmp
 intcmp: build/bin/intcmp
 build/bin/intcmp: src/intcmp.rs build rustlibs
-	$(RUSTC) $(RUSTFLAGS) $(RUSTLIBS) -o $@ src/intcmp.rs
+	$(RUSTC) $(RUSTFLAGS) -o $@ src/intcmp.rs
 
 .PHONY: mm
 mm: build/bin/mm
 build/bin/mm: src/mm.rs build rustlibs 
-	$(RUSTC) $(RUSTFLAGS) $(RUSTLIBS) -o $@ src/mm.rs
+	$(RUSTC) $(RUSTFLAGS) -o $@ src/mm.rs
 
 .PHONY: npc
 npc: build/bin/npc
 build/bin/npc: src/npc.c build
-	$(CC) $(CFLAGAS) -o $@ src/npc.c
+	$(CC) $(CFLAGS) -o $@ src/npc.c
 
 .PHONY: rpn
 rpn: build/bin/rpn
 build/bin/rpn: src/rpn.rs build rustlibs
-	$(RUSTC) $(RUSTFLAGS) $(RUSTLIBS) -o $@ src/rpn.rs
+	$(RUSTC) $(RUSTFLAGS) -o $@ src/rpn.rs
 
 .PHONY: scrut
 scrut: build/bin/scrut
@@ -145,7 +160,7 @@ build/bin/strcmp: src/strcmp.c build
 .PHONY: swab
 swab: build/bin/swab
 build/bin/swab: src/swab.rs build rustlibs
-	$(RUSTC) $(RUSTFLAGS) $(RUSTLIBS) -o $@ src/swab.rs
+	$(RUSTC) $(RUSTFLAGS) -o $@ src/swab.rs
 
 .PHONY: true
 true: build/bin/true

docs/swab.1

@@ -33,6 +33,7 @@ line:
 .RS
 printf 'hello world!\(rsn' | swab
 .RE
+.\" If you change this, make sure to change it in tests/bonsai/swab.mk too.
 
 Produces the following output:
 

include/FreeBSD.mk

@@ -0,0 +1,6 @@
+# Copyright (c) 2024 Emma Tebibyte <emma@tebibyte.media>
+# SPDX-License-Identifier: FSFAP
+#
+# Copying and distribution of this file, with or without modification, are
+# permitted in any medium without royalty provided the copyright notice and this
+# notice are preserved.  This file is offered as-is, without any warranty.

include/OpenBSD.mk

@@ -0,0 +1,13 @@
+# Copyright (c) 2024 Emma Tebibyte <emma@tebibyte.media>
+# SPDX-License-Identifier: FSFAP
+#
+# Copying and distribution of this file, with or without modification, are
+# permitted in any medium without royalty provided the copyright notice and this
+# notice are preserved.  This file is offered as-is, without any warranty.
+
+OSLIB = build/o/libopenbsd.rlib
+RUSTFLAGS += --extern openbsd=$(OSLIB)
+
+$(OSLIB): src/libopenbsd.rs
+	$(RUSTC) $(RUSTFLAGS) --crate-type=lib --crate-name=openbsd \
+		-o $@ src/libopenbsd.rs

src/dj.c

@@ -26,7 +26,8 @@
 #include <string.h> /* memcpy(3), memmove(3), memset(3) */
 #include <sysexits.h> /* EX_OK, EX_OSERR, EX_USAGE */
 #include <unistd.h> /* close(2), getopt(3), lseek(2), read(2), write(2),
-                     * optarg, optind, STDIN_FILENO, STDOUT_FILENO */
+                     * pledge(2), unveil(2), optarg, optind, STDIN_FILENO,
+					 * STDOUT_FILENO */
 #include <sys/stat.h> /* S_IRGRP, S_IROTH, S_IRUSR, S_IWGRP, S_IWOTH, S_IWUSR */
 
 char *program_name = "dj";
@@ -107,8 +108,10 @@ Io_write(struct Io *io) {
 }
 
 static int
-oserr(char *e, int n) {
-	(void)fprintf(stderr, "%s: %s: %s\n", program_name, e, strerror(n));
+oserr(char *e, int n) { /* program_name: [failing component:] error */
+	(void)fprintf(stderr, "%s: ", program_name);
+	if (e != NULL) { (void)fprintf(stderr, "%s: ", e); }
+	(void)fprintf(stderr, "%s\n", strerror(n));
 
 	return EX_OSERR;
 }
@@ -167,6 +170,12 @@ usage(char *argv0) {
 }
 
 int main(int argc, char *argv[]) {
+#ifdef __OpenBSD__
+	if (pledge("cpath rpath stdio unveil wpath", NULL) == -1) {
+		return oserr(NULL", errno);
+	}
+#endif
+
    	int align;    /* low 8b used, negative if no alignment is being done */
 	int count;    /* -1 if dj(1) runs until no more reads are possible */
 	char *fmt;    /* set to fmt_asv (default) or fmt_human (-H) */
@@ -208,6 +217,16 @@ int main(int argc, char *argv[]) {
 						break;
 					} else {
 						int fd;
+#ifdef __OpenBSD__
+						char *perms = "wc";
+
+						/* modify perms in-place to read-only */
+						if (i == 0) { perms = "r"; }
+
+						if (unveil(optarg, perms) == -1) {
+							return oserr(NULL, errno);
+						}
+#endif
 
 						if (
 							(fd = open(optarg, io[i].fl, creat_mode)) != -1
@@ -248,6 +267,9 @@ int main(int argc, char *argv[]) {
 			}
 		}
 	}
+#ifdef __OpenBSD__
+	if (unveil(NULL, NULL) == -1) { return oserr(NULL, errno); }
+#endif
 
 	assert(io->fd != STDIN_FILENO  || io->fl == read_flags);
 	assert(io->fd != STDOUT_FILENO || io->fl == write_flags);

src/false.c

@@ -1,9 +1,18 @@
 /*
- * Copyright (c) 2023 Emma Tebibyte <emma@tebibyte.media>
+ * Copyright (c) 2023–2024 Emma Tebibyte <emma@tebibyte.media>
  * SPDX-License-Identifier: CC0
  *
  * This work is marked with CC0 1.0. To view a copy of this license, visit
  * <http://creativecommons.org/publicdomain/zero/1.0>.
  */
 
-int main() { return 1; }
+#ifdef __OpenBSD__
+#	include <unistd.h> /* pledge(2) */
+#endif
+
+int main() {
+#ifdef __OpenBSD__
+	pledge(NULL, NULL);
+#endif
+return 1;
+}

src/fop.rs

@@ -30,11 +30,23 @@ use getopt::GetOpt;
 use strerror::StrError;
 use sysexits::{ EX_DATAERR, EX_IOERR, EX_UNAVAILABLE, EX_USAGE };
 
+#[cfg(target_os="openbsd")] use sysexits::EX_OSERR;
+#[cfg(target_os="openbsd")] extern crate openbsd;
+#[cfg(target_os="openbsd")] use openbsd::{ Promises, pledge };
+
 fn main() {
 	let argv = args().collect::<Vec<String>>();
 	let mut d = '\u{1E}'.to_string(); /* ASCII record separator */
 	let mut optind = 1;
 
+	if cfg!(target_os="openbsd") {
+		let promises = Promises::new("stdio proc exec");
+		if let Err(e) = pledge(Some(promises), None) {
+			eprintln!("{}: {}", argv[0], e.strerror());
+			exit(EX_OSERR);
+		}
+	}
+
 	let usage = format!(
 		"Usage: {} [-d delimiter] index command [args...]",
 		argv[0],

src/hru.rs

@@ -27,7 +27,11 @@ extern crate strerror;
 extern crate sysexits;
 
 use strerror::StrError;
-use sysexits::{ EX_DATAERR, EX_IOERR, EX_SOFTWARE };
+use sysexits::{ EX_DATAERR, EX_IOERR, EX_SOFTWARE, EX_USAGE };
+
+#[cfg(target_os="openbsd")] use sysexits::EX_OSERR;
+#[cfg(target_os="openbsd")] extern crate openbsd;
+#[cfg(target_os="openbsd")] use openbsd::{ Promises, pledge };
 
 /* list of SI prefixes */
 const LIST: [(u32, &str); 10] = [
@@ -76,6 +80,20 @@ fn convert(input: u128) -> Result<(f64, (u32, &'static str)), String> {
 
 fn main() -> ExitCode {
 	let argv = args().collect::<Vec<String>>();
+
+	if let Some(_) = argv.get(1) {
+		eprintln!("Usage: {}", argv[0]);
+		return ExitCode::from(EX_USAGE as u8);
+	}
+
+	if cfg!(target_os="openbsd") {
+		let promises = Promises::new("stdio");
+		if let Err(e) = pledge(Some(promises), None) {
+			eprintln!("{}: {}", argv[0], e.strerror());
+			return ExitCode::from(EX_OSERR as u8);
+		}
+	}
+
 	let mut buf = String::new();
 
 	while let Ok(_) = stdin().read_line(&mut buf) {

src/intcmp.rs

@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2023–2024 DTB <trinity@trinity.moe>
+ * Copyright (c) 2024 Emma Tebibyte <emma@tebibyte.media>
  * SPDX-License-Identifier: AGPL-3.0-or-later
  *
  * This program is free software: you can redistribute it and/or modify it under
@@ -22,11 +23,18 @@ use std::{
 };
 
 extern crate getopt;
-use getopt::GetOpt;
-
 extern crate sysexits;
+
+use getopt::GetOpt;
 use sysexits::EX_USAGE;
 
+#[cfg(target_os="openbsd")] use sysexits::EX_OSERR;
+#[cfg(target_os="openbsd")] extern crate openbsd;
+#[cfg(target_os="openbsd")] extern crate strerror;
+#[cfg(target_os="openbsd")] use openbsd::{ Promises, pledge };
+#[cfg(target_os="openbsd")] use strerror::StrError;
+
+
 fn usage(s: &str) -> ExitCode {
 	eprintln!("Usage: {} [-egl] integer integer...", s);
 	ExitCode::from(EX_USAGE as u8)
@@ -34,6 +42,15 @@ fn usage(s: &str) -> ExitCode {
 
 fn main() -> ExitCode {
 	let argv = args().collect::<Vec<String>>();
+
+	if cfg!(target_os="openbsd") {
+		let promises = Promises::new("stdio");
+		if let Err(e) = pledge(Some(promises), None) {
+			eprintln!("{}: {}", argv[0], e.strerror());
+			return ExitCode::from(EX_OSERR as u8);
+		}
+	}
+
 	let mut e = false; /* args can be == */
 	let mut g = false; /* args can be > */
 	let mut l = false; /* args can be < */
@@ -46,11 +63,13 @@ fn main() -> ExitCode {
 			Ok("e") => e = true,
 			Ok("g") => g = true,
 			Ok("l") => l = true,
-			_ => { return usage(&argv[0]); },
+			_ => return usage(&argv[0]),
 		}
 		optind = opt.ind();
 	}
 
+	if !e & !g & !l { return usage(&argv[0]); }
+
 	if argv.len() - optind < 2 /* see usage */ { return usage(&argv[0]); }
 
 	let mut prev: Option<usize> = None; /* no previous operand */
@@ -59,8 +78,8 @@ fn main() -> ExitCode {
 	for arg in argv.iter().skip(optind) { /* iterate operands */
 		match arg.parse::<usize>() { /* parse current operand */
 			Ok(n) => currn = n,
-			_ => {
-				eprintln!("{}: {}: Invalid integer", &argv[0], arg);
+			Err(e) => {
+				eprintln!("{}: {}: {}", &argv[0], arg, e);
 				return ExitCode::from(EX_USAGE as u8);
 			}
 		}

src/libopenbsd.rs

@@ -0,0 +1,97 @@
+/*
+ * Copyright (c) 2024 Emma Tebibyte <emma@tebibyte.media>
+ * 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::{
+	ffi::CString,
+	io::Error,
+	ptr::null,
+};
+
+mod openbsd {
+	use std::ffi::{ c_char, c_int };
+	extern "C" {
+		pub fn pledge(arg1: *const c_char, arg2: *const c_char) -> c_int;
+
+		pub fn unveil(arg1: *const c_char, arg2: *const c_char) -> c_int;
+
+		pub fn __errno() -> *mut c_int;
+	}
+}
+
+pub struct Promises(*const i8);
+
+impl Promises {
+	pub fn new(promises: &str) -> Self {
+		let p = CString::new(promises).unwrap();
+
+		Promises(p.into_raw() as *const i8)
+	}
+}
+
+pub fn pledge(
+	promises: Option<Promises>, execpromises: Option<Promises>
+) -> Result<(), Error> {
+	/* From pledge(2):
+	 *
+	 * Passing NULL to promises or execpromises specifies to not change
+	 * the current value. */
+	let arg1 = promises.unwrap_or(Promises(null())).0;
+	let arg2 = execpromises.unwrap_or(Promises(null())).0;
+
+	unsafe {
+		match openbsd::pledge(arg1, arg2) {
+			-1 => Err(Error::from_raw_os_error(*openbsd::__errno())),
+			0 => Ok(()),
+			_ => panic!(), /* unreachable */
+		}
+	}
+}
+
+pub struct UnveilPerms(CString);
+
+impl UnveilPerms {
+	pub fn new(permissions: Vec<char>) -> Self {
+		if permissions.is_empty() {
+			return UnveilPerms(CString::new("").unwrap());
+		}
+
+		UnveilPerms(
+			CString::new(permissions.iter().collect::<String>()).unwrap()
+		)
+	}
+}
+
+pub fn unveil(
+	path: Option<&str>,
+	permissions: Option<UnveilPerms>,
+) -> Result<(), Error> {
+	let path_c = path.map(CString::new).map(Result::unwrap);
+	let arg1 = path_c.map(|p| p.into_raw() as *const i8).unwrap_or(null());
+
+	let arg2 = permissions
+		.map(|p| p.0.into_raw() as *const i8)
+		.unwrap_or(null());
+
+	unsafe {
+		match openbsd::unveil(arg1, arg2) {
+			-1 => Err(Error::from_raw_os_error(*openbsd::__errno())),
+			0 => Ok(()),
+			_ => panic!(), /* unreachable */
+		}
+	}
+}

src/mm.rs

@@ -33,6 +33,16 @@ use getopt::GetOpt;
 use strerror::StrError;
 use sysexits::{ EX_IOERR, EX_USAGE };
 
+#[cfg(target_os="openbsd")] use sysexits::EX_OSERR;
+#[cfg(target_os="openbsd")] extern crate openbsd;
+#[cfg(target_os="openbsd")]
+use openbsd::{
+	Promises,
+	UnveilPerms,
+	pledge,
+	unveil,
+};
+
 use ArgMode::*;
 
 enum ArgMode { In, Out }
@@ -41,6 +51,14 @@ fn main() -> ExitCode {
 	let argv = args().collect::<Vec<_>>();
 	let usage = format!("Usage: {} [-aetu] [-i input] [-o output]", argv[0]);
 
+	if cfg!(target_os="openbsd") {
+		let promises = Promises::new("rpath stdio unveil");
+		if let Err(e) = pledge(Some(promises), None) {
+			eprintln!("{}: {}", argv[0], e.strerror());
+			return ExitCode::from(EX_OSERR as u8);
+		}
+	}
+
 	let mut a = false; /* append to the file */
 	let mut e = false; /* use stderr as an output */
 	let mut t = true; /* do not truncate the file before writing */
@@ -58,11 +76,29 @@ fn main() -> ExitCode {
 			Ok("t") => t = false,
 			Ok("i") => { /* add inputs */
 				let input = opt.arg().unwrap();
+
+				if cfg!(target_os="openbsd") {
+					let perms = UnveilPerms::new(vec!['r']);
+					if let Err(e) = unveil(Some(&input), Some(perms)) {
+						eprintln!("{}: {}", argv[0], e.strerror());
+						return ExitCode::from(EX_OSERR as u8);
+					}
+				}
+
 				ins.push(input);
 				mode = Some(In); /* latest argument == -i */
 			},
 			Ok("o") => { /* add output */
 				let output = opt.arg().unwrap(); 
+
+				if cfg!(target_os="openbsd") {
+					let perms = UnveilPerms::new(vec!['w', 'c']);
+					if let Err(e) = unveil(Some(&output), Some(perms)) {
+						eprintln!("{}: {}", argv[0], e.strerror());
+						return ExitCode::from(EX_OSERR as u8);
+					}
+				}
+
 				outs.push(output);
 				mode = Some(Out); /* latest argument == -o */
 			},
@@ -86,8 +122,17 @@ fn main() -> ExitCode {
 				Out => outs.push(arg.to_string()),
 			};
 		}
-	} else {
-		eprintln!("{}", usage);
+	}
+
+	if cfg!(target_os="openbsd") {
+		if let Err(e) = unveil(None, None) {
+			eprintln!("{}: {}", argv[0], e.strerror());
+			return ExitCode::from(EX_OSERR as u8);
+		}
+	}
+
+	if ins.is_empty() && outs.is_empty() && argv.len() > optind {
+		eprintln!("Usage: {}", usage);
 		return ExitCode::from(EX_USAGE as u8);
 	}
 

src/npc.c

@@ -19,8 +19,8 @@
 
 #include <stdio.h> /* fprintf(3), fputs(3), getc(3), perror(3), putc(3), stdin,
                     * stdout, EOF */
-#include <sysexits.h> /* EX_IOERR, EX_OK, EX_USAGE */
-#include <unistd.h> /* getopt(3) */
+#include <sysexits.h> /* EX_IOERR, EX_OK, EX_OSERR, EX_USAGE */
+#include <unistd.h> /* pledge(2), getopt(3) */
 
 char *program_name = "npc";
 
@@ -39,13 +39,22 @@ usage(char *argv0) {
 }
 
 int main(int argc, char *argv[]) {
+#ifdef __OpenBSD__
+	program_name = argv[0] == NULL ? program_name : argv[0];
+
+	if (pledge("stdio", NULL) == -1) {
+		perror(program_name);
+		return EX_OSERR;
+	}
+#endif
 	int c;
 	char showend = 0; /* print a dollar sign before each newline */
 	char showtab = 0; /* prints tab characters in caret notation */
 
 	if (argc > 0) {
+#ifndef __OpenBSD__
 		program_name = argv[0];
-
+#endif
 		while ((c = getopt(argc, argv, "et")) != -1) {
 			switch (c){
 				case 'e': showend = 1; break;

src/rpn.rs

@@ -56,6 +56,12 @@ extern crate sysexits;
 
 use sysexits::EX_DATAERR;
 
+#[cfg(target_os="openbsd")] use sysexits::EX_OSERR;
+#[cfg(target_os="openbsd")] extern crate strerror;
+#[cfg(target_os="openbsd")] extern crate openbsd;
+#[cfg(target_os="openbsd")] use strerror::StrError;
+#[cfg(target_os="openbsd")] use openbsd::{ Promises, pledge };
+
 #[derive(Clone, PartialEq, PartialOrd, Debug)]
 /* enum CalcType is a type containing operations used in the calculator */
 enum CalcType {
@@ -191,6 +197,15 @@ fn round_precise(value: &f64, precision: usize) -> f64 {
 
 fn main() -> ExitCode {
 	let argv = args().collect::<Vec<String>>();
+
+	if cfg!(target_os="openbsd") {
+		let promises = Promises::new("stdio");
+		if let Err(e) = pledge(Some(promises), None) {
+			eprintln!("{}: {}", argv[0], e.strerror());
+			return ExitCode::from(EX_OSERR as u8);
+		}
+	}
+
 	let mut stack = VecDeque::new();
 	let mut buf = String::new();
 	/* Set floating-point precision for correcting rounding errors based on

src/scrut.c

@@ -20,15 +20,16 @@
 #include <stdio.h> /* fprintf(3), stderr, NULL */
 #include <stdlib.h> /* EXIT_FAILURE, EXIT_SUCCESS */
 #include <string.h> /* memset(3), strchr(3) */
-#include <sysexits.h> /* EX_USAGE */
-#include <unistd.h> /* access(3), getopt(3), F_OK, R_OK, W_OK, X_OK */
+#include <sysexits.h> /* EX_OSERR, EX_USAGE */
+#include <unistd.h> /* access(3), getopt(3), pledge(2), unveil(2), F_OK, R_OK,
+					 * W_OK, X_OK */
 #include <sys/stat.h> /* lstat(3), stat struct, S_ISBLK, S_ISCHR, S_ISDIR,
                        * S_ISFIFO, S_ISGID, S_ISREG, S_ISLNK, S_ISSOCK,
                        * S_ISUID, S_ISVTX */
 
 char *program_name = "scrut";
 #define OPTS "bcdefgkprsuwxLS"
-static char *opts = OPTS;
+static char opts[] = OPTS;
 
 static int
 usage(char *argv0) {
@@ -40,7 +41,16 @@ usage(char *argv0) {
 int main(int argc, char *argv[]) {
 	char sel[(sizeof opts) / (sizeof *opts)];
 
-	if (argc < 2) { return usage(argv[0] == NULL ? program_name : argv[0]); }
+	program_name = argv[0] == NULL ? program_name : argv[0];
+
+#ifdef __OpenBSD__
+	if (pledge("rpath stdio unveil", NULL) == -1) {
+		perror(program_name);
+		return EX_OSERR;
+	}
+#endif
+
+	if (argc < 2) { return usage(program_name); }
 
 	{ /* option parsing */
 		char *p;
@@ -66,6 +76,13 @@ int main(int argc, char *argv[]) {
 	for (argv += optind ; *argv != NULL; ++argv) {
 		struct stat buf;
 
+#ifdef __OpenBSD__
+		if (unveil(*argv, "r") == -1) {
+			perror(program_name);
+			return EX_OSERR;
+		}
+#endif
+
 		if(access(*argv, F_OK) != 0 || lstat(*argv, &buf) == -1) {
 			return EXIT_FAILURE; /* doesn't exist or isn't stattable */
 		}

src/str.c

@@ -19,10 +19,14 @@
 
 #include <ctype.h>
 #include <stddef.h> /* NULL */
-#include <stdio.h> /* fprintf(3) */
+#include <stdio.h> /* fprintf(3), perror(3) */
 #include <stdlib.h> /* size_t, EXIT_FAILURE */
 #include <string.h> /* strcmp(3) */
-#include <sysexits.h> /* EX_USAGE */
+#include <sysexits.h> /* EX_OSERR, EX_USAGE */
+
+#ifdef __OpenBSD__
+#	include <unistd.h> /* pledge(2) */
+#endif
 
 char *program_name = "str";
 
@@ -55,8 +59,16 @@ usage(char *argv0) {
 int main(int argc, char *argv[]) {
 	size_t ctype; // selected from ctypes.h; index of ctype
 	int retval; // initially fail but becomes success on the first valid char
+	program_name = argv[0] == NULL ? program_name : argv[0];
 
-	if (argc < 3) { return usage(argv[0] == NULL ? program_name : argv[0]); }
+#ifdef __OpenBSD__
+	if (pledge("stdio", NULL) == -1) {
+		perror(program_name);
+		return EX_OSERR;
+	}
+#endif
+
+	if (argc < 3) { return usage(program_name); }
 
 	for ( /* iterate ctypes */
 		ctype = 0;

src/strcmp.c

@@ -16,20 +16,28 @@
  * 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), stderr */
-#include <sysexits.h> /* EX_OK, EX_USAGE */
+#include <stdio.h> /* fprintf(3), perror(3), stderr */
+#include <sysexits.h> /* EX_OK, EX_OSERR, EX_USAGE */
+
+#ifdef __OpenBSD__
+#	include <unistd.h> /* pledge(2) */
+#endif
 
 char *program_name = "strcmp";
 
 int main(int argc, char *argv[]) {
+	program_name = argv[0] == NULL ? program_name : argv[0];
 	int i;
 
+#ifdef __OpenBSD__
+	if (pledge("stdio", NULL) == -1) {
+		perror(program_name);
+		return EX_OSERR;
+	}
+#endif
+
 	if (argc < 3) {
-		(void)fprintf(
-			stderr,
-			"Usage: %s string string...\n",
-			argv[0] == NULL ? program_name : argv[0]
-		);
+		(void)fprintf(stderr, "Usage: %s string string...\n", program_name);
 
 		return EX_USAGE;
 	}

src/swab.rs

@@ -32,6 +32,10 @@ use getopt::GetOpt;
 use sysexits::{ EX_IOERR, EX_OK, EX_OSERR, EX_USAGE };
 use strerror::StrError;
 
+#[cfg(target_os="openbsd")] extern crate openbsd;
+#[cfg(target_os="openbsd")] use openbsd::{ Promises, pledge };
+
+
 fn oserr(argv0: &str, e: Error) -> ExitCode {
 	eprintln!("{}: {}", argv0, e.strerror());
 	ExitCode::from(EX_OSERR as u8)
@@ -49,6 +53,14 @@ fn usage(s: &str) -> ExitCode {
 
 fn main() -> ExitCode {
 	let argv = args().collect::<Vec<String>>();
+	
+	if cfg!(target_os="openbsd") {
+		let promises = Promises::new("stdio");
+		if let Err(e) = pledge(Some(promises), None) {
+			return oserr(&argv[0], e);
+		}
+	}
+
 	let mut buf: Vec<u8> = Vec::new(); // holds the sequence getting swabbed
 	let mut input = stdin();
 	let mut output = stdout().lock();

src/true.c

@@ -1,9 +1,17 @@
 /*
- * Copyright (c) 2023 Emma Tebibyte <emma@tebibyte.media>
+ * Copyright (c) 2023–2024 Emma Tebibyte <emma@tebibyte.media>
  * SPDX-License-Identifier: CC0
  *
  * This work is marked with CC0 1.0. To view a copy of this license, visit
  * <http://creativecommons.org/publicdomain/zero/1.0>.
  */
 
-int main() {}
+#ifdef __OpenBSD__
+#	include <unistd.h> /* pledge(2) */
+#endif
+
+int main() {
+#ifdef __OpenBSD__
+	pledge(NULL, NULL);
+#endif
+}

tests/README

@@ -0,0 +1,36 @@
+The testing suite contains two trees: the Bonsai tree and the POSIX tree:
+
+.
+├── README
+├── bonsai/
+│   ├── dj.mk
+│   ├── false.mk
+│   ├── fop.mk
+│   └── ...
+├── posix/
+└── tests.mk
+
+The Bonsai tree tests the functionality of Harakit utilities for regressions and
+other issues relating to compliance to our standards of practice.
+
+The POSIX tests are currently a work-in-progress. Their status in this
+repository is uncertain.
+
+Both sets of tests also inherit the environment set by the top-level Makefile,
+which sets the BIN variable to the build/bin directory at the root of the
+project; therefore, each binary is located at $(BIN)/tool for idiomatic access.
+
+Each test contains a set of PHONY targets which are prefixed with the name of
+the tool being tested and an underscore. The first target is tests, which
+depends on all the other targets in the test file. These test files are each
+included in the top Makefile, so they can be called from the root of the
+repository. This also means that BIN can be set manually so that tests can be
+run using make(1) inside of the tests directory:
+
+	$ make -f tests.mk BIN=../build/bin dj_tests
+
+--
+Copyright © 2024 Emma Tebibyte <emma@tebibyte.media>
+
+This work is licensed under CC BY-SA 4.0. To view a copy of this license, visit
+<http://creativecommons.org/licenses/by-sa/4.0/>.

tests/bonsai/dj.mk

@@ -0,0 +1,48 @@
+# Copyright (c) 2024 DTB <trinity@trinity.moe>
+# Copyright (c) 2024 Emma Tebibyte <emma@tebibyte.media>
+# SPDX-License-Identifier: FSFAP
+#
+# Copying and distribution of this file, with or without modification, are
+# permitted in any medium without royalty provided the copyright notice and this
+# notice are preserved.  This file is offered as-is, without any warranty.
+
+.PRAGMA: command_comment
+
+/dev/full:
+/dev/null:
+
+.PHONY: dj_tests
+dj_tests: dj_help dj_full dj_null # dj_skip_stdin
+
+.PHONY: dj_full
+# Linux has a /dev/full pseudodevice useful for testing errors.
+dj_full: $(BIN)/dj /dev/full
+	case "$$(uname)" in \
+	Linux) \
+		$(BIN)/dj -Hi /dev/zero -o /dev/full 2>&1 \
+			| tee /dev/stderr \
+			| xargs -I out test '1+0 > 0+0; 1024 > 0' = out \
+		;; \
+	esac
+
+.PHONY: dj_help
+dj_help: $(BIN)/dj
+	! $(BIN)/dj -h
+
+.PHONY: dj_null
+# Read nothing from /dev/null, write nothing to /dev/null.
+dj_null: $(BIN)/dj /dev/null
+	$(BIN)/dj -Hi /dev/null -o /dev/null 2>&1 \
+		| tee /dev/stderr \
+		| xargs -I out test '0+0 > 0+0; 0 > 0' = out
+
+# This test currently fails. This is probably due to dj(1) being stale relative
+# to the main harakit branch. TODO: Reassess once the testing branch is merged.
+# .PHONY: dj_skip_stdin
+# # Test skipping stdin.
+# dj_skip_stdin: $(BIN)/dj
+# 	# Pipe 1024B of '\0' into dj(1); skip the first 24B; expect 1000B written.
+# 	dd count=1 bs=1024 </dev/zero 2>/dev/null \
+# 		| $(BIN)/dj -H -s 24 -o /dev/null 2>&1 \
+# 		| tee /dev/stderr \
+# 		| xargs -I out test '1+0 > 1+0; 1024 > 1000' = out

tests/bonsai/false.mk

@@ -0,0 +1,18 @@
+# Copyright (c) 2024 DTB <trinity@trinity.moe>
+# Copyright (c) 2024 Emma Tebibyte <emma@tebibyte.media>
+# SPDX-License-Identifier: FSFAP
+#
+# Copying and distribution of this file, with or without modification, are
+# permitted in any medium without royalty provided the copyright notice and this
+# notice are preserved.  This file is offered as-is, without any warranty.
+
+.PHONY: false_tests
+false_tests: false_test false_help
+
+.PHONY: false
+false_test: $(BIN)/false
+	! $(BIN)/false
+
+.PHONY: false_help
+false_help: $(BIN)/false
+	! $(BIN)/false -h

tests/bonsai/fop.mk

@@ -0,0 +1,31 @@
+# Copyright (c) 2024 Emma Tebibyte <emma@tebibyte.media>
+# SPDX-License-Identifier: FSFAP
+#
+# Copying and distribution of this file, with or without modification, are
+# permitted in any medium without royalty provided the copyright notice and this
+# notice are preserved.  This file is offered as-is, without any warranty.
+
+.PHONY: fop_tests
+fop_tests: fop_functionality fop_delimiter fop_help fop_fail
+
+.PHONY: fop_help
+fop_help: $(BIN)/fop
+	! $(BIN)/fop -h
+
+.PHONY: fop_delimiter
+fop_delimiter: $(BIN)/fop
+	test "$$(printf 'test1 test1 test1\n' | $(BIN)/fop -d' ' 2 sed 's/1/4/g')" \
+		= 'test1 test1 test4'
+	test "$$(printf 'meowsetwoofsetribbit\n' \
+		| $(BIN)/fop -d 'set' 1 sed 's/woof/meow/g')" = 'meowsetmeowsetribbit'
+
+.PHONY: fop_fail
+fop_fail: $(BIN)/fop
+	! printf 'test\n' | $(BIN)/fop 1 cat
+	! printf 'test\n' | $(BIN)/fop 'test' cat
+	! printf 'test\n' | $(BIN)/fop -d'test' cat
+
+.PHONY: fop_functionality
+fop_functionality: $(BIN)/fop
+	test "$$(printf 'test1\036test1\036test1\n' | $(BIN)/fop 1 sed 's/1/4/g')" \
+		= "$$(printf 'test1\036test4\036test1\n')"

tests/bonsai/hru.mk

@@ -0,0 +1,32 @@
+# Copyright (c) 2024 Emma Tebibyte <emma@tebibyte.media>
+# SPDX-License-Identifier: FSFAP
+#
+# Copying and distribution of this file, with or without modification, are
+# permitted in any medium without royalty provided the copyright notice and this
+# notice are preserved.  This file is offered as-is, without any warranty.
+
+.PHONY: hru_tests
+hru_tests: hru_help hru_functionality hru_negative hru_regressions
+
+.PHONY: hru_help
+hru_help: $(BIN)/hru
+	! $(BIN)/hru -h
+
+.PHONY: hru_functionality
+hru_functionality: $(BIN)/hru
+	test "$$(printf '1234\n' | $(BIN)/hru)" = '1.2 kB'
+	test "$$(printf '0\n' | $(BIN)/hru)" = '0 B'
+
+.PHONY: hru_negative
+hru_negative: $(BIN)/hru
+	! printf '%s\n' '-1' | $(BIN)/hru
+
+.PHONY: hru_regressions
+hru_regressions: $(BIN)/hru
+	n=1; \
+	while true; \
+	do \
+		printf '%s\n' "$$n" | $(BIN)/hru || break; \
+		n="$$(($$n * 10))"; \
+	done; \
+	printf 'Max float: %s\n' "$$n"

tests/bonsai/intcmp.mk

@@ -0,0 +1,67 @@
+# Copyright (c) 2024 DTB <trinity@trinity.moe>
+# Copyright (c) 2024 Emma Tebibyte <emma@tebibyte.media>
+# SPDX-License-Identifier: FSFAP
+#
+# Copying and distribution of this file, with or without modification, are
+# permitted in any medium without royalty provided the copyright notice and this
+# notice are preserved.  This file is offered as-is, without any warranty.
+
+.PHONY: intcmp_tests
+intcmp_tests: intcmp_help intcmp_none intcmp_e intcmp_g intcmp_l intcmp_combined
+
+.PHONY: intcmp_help
+intcmp_help: $(BIN)/intcmp
+	! $(BIN)/intcmp -h
+
+# These test that integer comparisons are working as they should. For the sake
+# of readability (to facilitate faster skimming) these recipes follow a
+# columned format:
+#	$binary       -flags d d d d  # op
+# For flag meanings reference intcmp(1) (though they are somewhat self
+# explanatory). d here refers to a decimal number; a mixture of 1s, 2s, and 3s
+# (a particularly lovely number) arranged to demonstrate easily the operation
+# under scrutiny. The commented op is the operation that is true for the given
+# numbers. For example:
+#	$(BIN)/intcmp   -e   3 3 3 3  # ==
+# op here is ==; 3 == 3 == 3 == 3. The flag being used is -e, to test for
+# equality, so this test should succeed.
+#	! $(BIN)/intcmp -l   3 2 1    # >
+# op here is >; 3 > 2 > 1. The flag being used is -l, to test for each integer
+# being less than the next, so intcmp should fail - hence the ! at the start of
+# the invocation. If this test failed, intcmp(1) would be confusing -l for -g,
+# so that would be a good place to start looking for bugs.
+
+.PHONY: intcmp_none
+intcmp_none: $(BIN)/intcmp
+	! $(BIN)/intcmp 1 2
+
+.PHONY: intcmp_e
+intcmp_e: $(BIN)/intcmp
+	$(BIN)/intcmp   -e   3 3 3    # ==
+	! $(BIN)/intcmp -e   1 2 3    # <
+	! $(BIN)/intcmp -e   3 2 1    # >
+
+.PHONY: intcmp_g
+intcmp_g: $(BIN)/intcmp
+	$(BIN)/intcmp   -g   3 2 1    # >
+	! $(BIN)/intcmp -g   3 3 3    # ==
+	! $(BIN)/intcmp -g   1 2 3    # <
+	$(BIN)/intcmp   -ge  3 3 1    # >=
+	! $(BIN)/intcmp -ge  1 2 3    # <
+
+.PHONY: intcmp_l
+intcmp_l: $(BIN)/intcmp
+	$(BIN)/intcmp   -l   1 2 3    # <
+	! $(BIN)/intcmp -l   3 3 3    # ==
+	! $(BIN)/intcmp -l   3 2 1    # >
+	$(BIN)/intcmp   -le  1 3 3    # <=
+	! $(BIN)/intcmp -le  3 2 1    # >
+
+.PHONY: intcmp_combined
+intcmp_combined: $(BIN)/intcmp
+	$(BIN)/intcmp   -gl  1 2 3    # <
+	$(BIN)/intcmp   -gl  3 2 1    # >
+	$(BIN)/intcmp   -gl  1 3 1    # !=
+	! $(BIN)/intcmp -gl  3 3 3    # ==
+	$(BIN)/intcmp   -egl 3 1 1 3  # >, ==, <
+	! $(BIN)/intcmp -egl foo      # huh?

tests/bonsai/mm.mk

@@ -0,0 +1,27 @@
+# Copyright (c) 2024 E$(NAME)a Tebibyte <e$(NAME)a@tebibyte.media>
+# SPDX-License-Identifier: FSFAP
+#
+# Copying and distribution of this file, with or without modification, are
+# permitted in any medium without royalty provided the copyright notice and this
+# notice are preserved.  This file is offered as-is, without any warranty.
+
+.PHONY: mm_tests
+mm_tests: mm_args mm_help mm_stderr
+
+.PHONY: mm_none
+mm_none: $(BIN)/mm
+	test "$$(printf 'meow\n' | $(BIN)/mm)" = meow
+
+.PHONY: mm_args
+# mm(1) will error if positional arguments are given without -i or -o
+mm_args: $(BIN)/mm
+	! $(BIN)/mm argument
+
+.PHONY: mm_help
+mm_help: $(BIN)/mm
+	! $(BIN)/mm -h
+
+.PHONY: mm_stderr
+# check if stderr is empty upon specifying -e
+mm_stderr: $(BIN)/mm
+	test "$$(printf 'test\n' | $(BIN)/mm -e 2>&1 >/dev/null )" = "test"

tests/bonsai/npc.mk

@@ -0,0 +1,72 @@
+#!/bin/sh
+# Copyright (c) 2024 DTB <trinity@trinity.moe>
+# Copyright (c) 2024 Emma Tebibyte <emma@tebibyte.media>
+# SPDX-License-Identifier: FSFAP
+#
+# Copying and distribution of this file, with or without modification, are
+# permitted in any medium without royalty provided the copyright notice and this
+# notice are preserved.  This file is offered as-is, without any warranty.
+
+.PRAGMA: command_comment
+
+.PHONY: npc_tests
+npc_tests: npc_help npc_args npc_ascii
+
+.PHONY: npc_help
+npc_help: $(BIN)/npc
+	! $(BIN)/npc -h
+
+.PHONY: npc_args
+# arg parsing
+npc_args:
+	$(BIN)/npc -e </dev/null
+	$(BIN)/npc -t </dev/null
+	$(BIN)/npc -et </dev/null
+	! $(BIN)/npc -et 5 </dev/null
+
+.PHONY: npc_ascii
+# Test 0x00 to 0x7f in input; in other words, the full 7b ASCII range.
+npc_ascii: npc_ascii_controls npc_ascii_symbols npc_ascii_uppers # \
+#	npc_ascii_lowers
+
+.PHONY: npc_ascii_controls
+# (control characters)
+npc_ascii_controls:
+	# ASCII 0x00 to 0x0a (before the newline, due to xargs(1p) issues)
+	awk 'BEGIN{ for (i = 0; i < 32; ++i) printf("%c", i); }' \
+		| $(BIN)/npc \
+		| head -n 1 \
+		| xargs -I out test "^@^A^B^C^D^E^F^G^H" = out
+
+	# ASCII 0x0a (otherwise the head|tail sequence won't work) to 0x1f
+	awk 'BEGIN{ for (i = 0; i < 32; ++i) printf("%c", i); print }' \
+		| $(BIN)/npc \
+		| head -n 2 \
+		| tail -n 1 \
+		| xargs -I out test "^K^L^M^N^O^P^Q^R^S^T^U^V^W^X^Y^Z^[^\^]^^^_"
+
+.PHONY: npc_ascii_symbols
+# ASCII 0x1f to 0x3f (^_ and symbols)
+npc_ascii_symbols:
+	# shell quoting olympics
+	awk 'BEGIN{ for (i = 31; i < 64; ++i) printf("%c", i); print }' \
+		| $(BIN)/npc \
+		| sed -e s"/\'/\\\'/g" -e 's/"/\\"/g' \
+		| xargs -I out test "^_ !\"#$$%&'()*+,-./0123456789:;<=>?" = out
+
+.PHONY: npc_ascii_uppers
+# ASCII 0x40 to 0x5f (uppercases)
+npc_ascii_uppers:
+	awk 'BEGIN{ for (i = 64; i < 96; ++i) printf("%c", i); print }' \
+		| $(BIN)/npc \
+		| sed 's/\\/\\\\/' \
+		| xargs -I out test @ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_ = out
+
+# This test is broken and will need closer inspection along with the npc(1)
+# source.
+# .PHONY: npc_ascii_lowers
+# # ASCII 0x60 to 0x7f (lowercases)
+# npc_ascii_lowers:
+# 	awk 'BEGIN{ for (i = 96; i < 128; ++i) printf("%c", i); print }' \
+# 		| $(BIN)/npc \
+# 		| xargs -I out test "\`abcdefghijklmnopqrstuvwxyz{|}~^?" = out

tests/bonsai/rpn.mk

@@ -0,0 +1,43 @@
+# Copyright (c) 2024 Emma Tebibyte <emma@tebibyte.media>
+# SPDX-License-Identifier: FSFAP
+#
+# Copying and distribution of this file, with or without modification, are
+# permitted in any medium without royalty provided the copyright notice and this
+# notice are preserved.  This file is offered as-is, without any warranty.
+
+.PHONY: rpn_tests
+rpn_tests: rpn_help rpn_add rpn_sub rpn_mul rpn_div rpn_mod rpn_flr
+
+.PHONY: rpn_help
+rpn_help: $(BIN)/rpn
+	! $(BIN)/rpn -h
+
+.PHONY: rpn_add
+rpn_add: $(BIN)/rpn
+	test "$$($(BIN)/rpn 1 2 +)" -eq 3
+	test "$$($(BIN)/rpn 0.2 0.1 +)" = 0.3
+
+.PHONY: rpn_sub
+rpn_sub: $(BIN)/rpn
+	test "$$($(BIN)/rpn 23 5 -)" -eq 18
+	test "$$($(BIN)/rpn 0.3 0.1 -)" = 0.2
+
+.PHONY: rpn_mul
+rpn_mul: $(BIN)/rpn
+	test "$$($(BIN)/rpn 1.2 3 '*')" = 3.6
+	test "$$($(BIN)/rpn 0 3 '*')" -eq 0
+
+.PHONY: rpn_div
+rpn_div: $(BIN)/rpn
+	test "$$($(BIN)/rpn 12 5 /)" = 2.4
+	test "$$($(BIN)/rpn 3 0 /)" -eq inf
+
+.PHONY: rpn_mod
+rpn_mod: $(BIN)/rpn
+	test "$$($(BIN)/rpn 12 5 %)" -eq 2
+	test "$$($(BIN)/rpn 9 4 %)" -eq 1
+
+.PHONY: rpn_flr
+rpn_flr: $(BIN)/rpn
+	test "$$($(BIN)/rpn 12 5 //)" -eq 2
+	test "$$($(BIN)/rpn 9 4 //)" -eq 2

tests/bonsai/scrut.mk

@@ -0,0 +1,46 @@
+#!/bin/sh
+# Copyright (c) 2024 DTB <trinity@trinity.moe>
+# SPDX-License-Identifier: FSFAP
+#
+# Copying and distribution of this file, with or without modification, are
+# permitted in any medium without royalty provided the copyright notice and this
+# notice are preserved.  This file is offered as-is, without any warranty.
+
+.PRAGMA: command_comment
+
+.PHONY: scrut_tests
+scrut_tests: scrut_help scrut_options
+
+.PHONY: scrut_help
+scrut_help: $(BIN)/scrut
+	! $(BIN)/scrut -h
+
+.PHONY: scrut_options
+# scrut tests file attributes, but files of a certain attribute aren't
+# guaranteed to be present on a system. This test checks all of the files in
+# harakit and, if test(1p) says a file matches a certain attribute, then checks
+# scrut.
+# opts are space-delimited (for command splitting), sel is not
+scrut_options: $(BIN)/scrut
+	set -e; \
+	opts="b c d e f g k p r s u w x L S"; \
+	sel=; \
+	find . -name .git -prune -o -print \
+		| while read -r f; do \
+			for opt in $$opts; \
+				do if ! printf "%s\n" $$sel | grep $$opt >/dev/null; then \
+					if test -$$opt "$$f"; then \
+						if ! $(BIN)/scrut -$$opt "$$f"; \
+							then printf "[!!] scrut -%s failed on %s.\n" \
+								$$opt "$$f"; \
+						fi; \
+						sel="$$sel$$opt"; \
+						printf "[OK] Tested scrut -%s using %s\n" \
+							$$opt "$$f"; \
+					fi; \
+				fi; \
+			done; \
+			if printf "%s\n" "$$opts" | sed 's/ //g' | xargs test "$$sel" =; \
+				then break; \
+			fi; \
+		done

tests/bonsai/str.mk

@@ -0,0 +1,20 @@
+# Copyright (c) 2024 DTB <trinity@trinity.moe>
+# SPDX-License-Identifier: FSFAP
+#
+# Copying and distribution of this file, with or without modification, are
+# permitted in any medium without royalty provided the copyright notice and this
+# notice are preserved.  This file is offered as-is, without any warranty.
+
+.PRAGMA: command_comment
+
+.PHONY: str_tests
+str_tests: str_help str_isalpha
+
+.PHONY: str_help
+str_help: $(BIN)/str
+	! $(BIN)/str -h
+
+.PHONY: str_isalpha
+str_isalpha: $(BIN)/str
+	$(BIN)/str   isalpha c
+	! $(BIN)/str isalpha 3

tests/bonsai/strcmp.mk

@@ -0,0 +1,31 @@
+# Copyright (c) 2024 DTB <trinity@trinity.moe>
+# Copyright (c) 2024 Emma Tebibyte <emma@tebibyte.media>
+# SPDX-License-Identifier: FSFAP
+#
+# Copying and distribution of this file, with or without modification, are
+# permitted in any medium without royalty provided the copyright notice and this
+# notice are preserved.  This file is offered as-is, without any warranty.
+
+NAME = strcmp
+TARGET = $(NAME)_tests
+BINARY = $(BIN)/$(NAME)
+
+.PHONY: strcmp_tests
+strcmp_tests: strcmp_equals strcmp_help strcmp_nocmp strcmp_unequals
+
+.PHONY: strcmp_equals
+strcmp_equals: $(BIN)/strcmp
+	$(BIN)/strcmp equals equals
+	$(BIN)/strcmp - -
+
+.PHONY: strcmp_help
+strcmp_help: $(BIN)/strcmp
+	! $(BIN)/strcmp -h
+
+.PHONY: strcmp_nocmp
+strcmp_nocmp: $(BIN)/strcmp
+	! $(BIN)/strcmp nocmp
+
+.PHONY: strcmp_unequals
+strcmp_unequals: $(BIN)/strcmp
+	! $(BIN)/strcmp unequals equals

tests/bonsai/swab.mk

@@ -0,0 +1,22 @@
+# Copyright (c) 2024 DTB <trinity@trinity.moe>
+# SPDX-License-Identifier: FSFAP
+#
+# Copying and distribution of this file, with or without modification, are
+# permitted in any medium without royalty provided the copyright notice and this
+# notice are preserved.  This file is offered as-is, without any warranty.
+
+.PRAGMA: command_comment
+
+.PHONY: swab_tests
+swab_tests: swab_help swab_examples
+
+.PHONY: swab_help
+swab_help: $(BIN)/swab
+	! $(BIN)/swab -h
+
+.PHONY: swab_examples
+# These are the examples present in the man page.
+swab_examples: $(BIN)/swab
+	printf 'hello world!\n' \
+		| $(BIN)/swab \
+		| xargs -I out test 'ehll oowlr!d' = out

tests/bonsai/true.mk

@@ -0,0 +1,19 @@
+#!/bin/sh
+# Copyright (c) 2024 DTB <trinity@trinity.moe>
+# Copyright (c) 2024 Emma Tebibyte <emma@tebibyte.media>
+# SPDX-License-Identifier: FSFAP
+#
+# Copying and distribution of this file, with or without modification, are
+# permitted in any medium without royalty provided the copyright notice and this
+# notice are preserved.  This file is offered as-is, without any warranty.
+
+.PHONY: true_tests
+true_tests: true_test
+
+.PHONY: true_help
+true_help: $(BIN)/true
+	$(BIN)/true -h
+
+.PHONY: true_test
+true_test: $(BIN)/true
+	$(BIN)/true

tests/posix-compat.sh

@@ -1,24 +0,0 @@
-#!/bin/sh
-
-# Copyright (c) 2023–2024 Emma Tebibyte <emma@tebibyte.media>
-# SPDX-License-Identifier: FSFAP
-#
-# Copying and distribution of this file, with or without modification, are
-# permitted in any medium without royalty provided the copyright notice and this
-# notice are preserved.  This file is offered as-is, without any warranty.
-
-set -e
-
-if ! ls Makefile >/dev/null 2>&1
-then
-	printf '%s: Run this script in the root of the project.\n' "$0" 1>&2 
-	exit 1
-fi
-
-printf "Starting POSIX compatibility testing.\n"
-
-for utility in tests/posix/*; do
-	printf '%s: %s: Testing utility.\n' "$0" "$utility"
-	"$utility"
-	printf '\n'
-done

tests/posix/bin/cat

@@ -0,0 +1,22 @@
+#!/bin/sh
+# Copyright (c) 2024 Emma Tebibyte <emma@tebibyte.media>
+# SPDX-License-Identifier: FSFAP
+#
+# Copying and distribution of this file, with or without modification, are
+# permitted in any medium without royalty provided the copyright notice and this
+# notice are preserved.  This file is offered as-is, without any warranty.
+
+# Strictly POSIX-compliant cat(1) implementation. See cat(1p)
+
+for arg in "$@"; do
+	case "$arg" in
+		-u) args="$(printf '%s	%s\n' "$args" "$arg")" ;;
+		*) args="$(printf -- '%s	-i	%s\n' "$args" "$arg")" ;;
+	esac
+done
+
+# See IEEE Std 1003.1-2017 3.282
+# https://pubs.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap03.html#tag_03_282
+IFS='	'
+
+mm $args

tests/posix/bin/false

@@ -0,0 +1,12 @@
+#!/bin/sh
+# Copyright (c) 2024 DTB <trinity@trinity.moe>
+# Copyright (c) 2024 Emma Tebibyte <emma@tebibyte.media>
+# SPDX-License-Identifier: FSFAP
+#
+# Copying and distribution of this file, with or without modification, are
+# permitted in any medium without royalty provided the copyright notice and this
+# notice are preserved.  This file is offered as-is, without any warranty.
+
+# Strictly POSIX-compliant false(1) implementation. See false(1p)
+
+false "$@"

tests/posix/bin/true

@@ -0,0 +1,11 @@
+#!/bin/sh
+# Copyright (c) 2024 DTB <trinity@trinity.moe>
+# Copyright (c) 2024 Emma Tebibyte <emma@tebibyte.media>
+# SPDX-License-Identifier: FSFAP
+#
+# Copying and distribution of this file, with or without modification, are
+# permitted in any medium without royalty provided the copyright notice and this
+# notice are preserved.  This file is offered as-is, without any warranty.
+
+# Strictly POSIX-compliant true(1) implementation. See true(1p)
+true "$@"

tests/posix/posix_env

@@ -0,0 +1,5 @@
+#!/bin/sh
+
+set -ex
+
+PATH="$PWD/bin:$PATH"

tests/tests.mk

@@ -0,0 +1,15 @@
+# Copyright (c) 2024 Emma Tebibyte <emma@tebibyte.media>
+# SPDX-License-Identifier: FSFAP
+#
+# Copying and distribution of this file, with or without modification, are
+# permitted in any medium without royalty provided the copyright notice and this 
+# notice are preserved.  This file is offered as-is, without any warranty.
+
+
+#TESTFILES != for file in tests/bonsai/*.mk tests/posix/*.mk; do printf '%s ' "$$file"; done;
+TESTFILES != for file in tests/bonsai/*.mk; do printf '%s ' "$$file"; done;
+
+TESTS != printf '%s\n' "$(TESTFILES)" | xargs -n1 basename \
+	| sed 's/\.mk/_tests/g'
+
+include $(TESTFILES)