intcmp(1): remove extra newline

Makefile

@@ -19,7 +19,7 @@ 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
+	|| printf '/dev/null\n'
 
 # normalized prefix
 PREFIX_N != dirname $(PREFIX)/.

src/dj.c

@@ -108,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;
 }
@@ -168,12 +170,6 @@ usage(char *argv0) {
 }
 
 int main(int argc, char *argv[]) {
-#ifdef __OpenBSD__
-	if (pledge("cpath rpath stdio unveil wpath", NULL) == -1) {
-		return oserr("pledge", 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) */
@@ -181,6 +177,12 @@ int main(int argc, char *argv[]) {
 	bool retry;   /* false if exits on partial reads or writes */
 	struct Io io[2 /* { in, out } */];
 
+#ifdef __OpenBSD__
+	if (pledge("cpath rpath stdio unveil wpath", NULL) == -1) {
+		return oserr(NULL, errno);
+	}
+#endif
+
 	/* Set defaults. */
 	align = -1;
 	count = -1;
@@ -215,14 +217,10 @@ 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("unveil", errno);
+						if (unveil(optarg, i == 0 ? "r" : "wc") == -1) {
+							return oserr(NULL, errno);
 						}
 #endif
 
@@ -265,8 +263,9 @@ int main(int argc, char *argv[]) {
 			}
 		}
 	}
+
 #ifdef __OpenBSD__
-	if (unveil(NULL, NULL) == -1) { return oserr("unveil", errno); }
+	if (unveil(NULL, NULL) == -1) { return oserr(NULL, errno); }
 #endif
 
 	assert(io->fd != STDIN_FILENO  || io->fl == read_flags);

src/false.c

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

src/hru.rs

@@ -29,6 +29,10 @@ extern crate sysexits;
 use strerror::StrError;
 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] = [
 	(3, "k"), /* kilo */
@@ -76,10 +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,17 @@ 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 +41,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 +62,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 +77,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

@@ -17,7 +17,7 @@
  */
 
 use std::{
-	ffi::CString,
+	ffi::{ CString, c_char },
 	io::Error,
 	ptr::null,
 };
@@ -33,13 +33,13 @@ mod openbsd {
 	}
 }
 
-pub struct Promises(*const i8);
+pub struct Promises(*const c_char);
 
 impl Promises {
 	pub fn new(promises: &str) -> Self {
 		let p = CString::new(promises).unwrap();
 
-		Promises(p.into_raw() as *const i8)
+		Promises(p.into_raw() as *const c_char)
 	}
 }
 
@@ -81,10 +81,10 @@ pub fn unveil(
 	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 arg1 = path_c.map(|p| p.into_raw() as *const c_char).unwrap_or(null());
 
 	let arg2 = permissions
-		.map(|p| p.0.into_raw() as *const i8)
+		.map(|p| p.0.into_raw() as *const c_char)
 		.unwrap_or(null());
 
 	unsafe {

src/mm.rs

@@ -131,7 +131,10 @@ fn main() -> ExitCode {
 		}
 	}
 
-	println!("{:?}", ins);
+	if ins.is_empty() && outs.is_empty() && argv.len() > optind {
+		eprintln!("Usage: {}", usage);
+		return ExitCode::from(EX_USAGE as u8);
+	}
 
 	/* use stdin if no inputs are specified */
 	if ins.is_empty() { ins.push("-".to_string()); }

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";
 
@@ -43,6 +43,13 @@ int main(int argc, char *argv[]) {
 	char showend = 0; /* print a dollar sign before each newline */
 	char showtab = 0; /* prints tab characters in caret notation */
 
+#ifdef __OpenBSD__
+	if (pledge("stdio", NULL) == -1) {
+		perror(argv[0] == NULL ? program_name : argv[0]);
+		return EX_OSERR;
+	}
+#endif
+
 	if (argc > 0) {
 		program_name = argv[0];
 

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

@@ -17,18 +17,21 @@
  * along with this program. If not, see https://www.gnu.org/licenses/.
  */
 
+#include <assert.h> /* assert(3) */
 #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;
+/* this is an array so main:sel's size can be known at compile time */
+static char opts[] = OPTS;
 
 static int
 usage(char *argv0) {
@@ -40,7 +43,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;
@@ -48,7 +60,10 @@ int main(int argc, char *argv[]) {
 		memset(sel, '\0', sizeof sel);
 		for (int c; (c = getopt(argc, argv, opts)) != -1;) {
 			if ((p = strchr(opts, c)) == NULL) { return usage(argv[0]); }
-			else { sel[p - opts] = c; }
+			else {
+				assert(p - opts < sizeof sel / sizeof *sel); /* bounds check */
+				sel[p - opts] = c;
+			}
 		}
 
 		/* straighten out selections; permute out nulls */
@@ -63,9 +78,16 @@ int main(int argc, char *argv[]) {
 
 	if (optind == argc) { return usage(argv[0]); }
 
-	for (argv += optind ; *argv != NULL; ++argv) {
+	for (argv += optind ; *argv != NULL; argv = &argv[1]) {
 		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,13 +16,25 @@
  * 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[]) {
-	int i;
+	unsigned int i;
+
+#ifdef __OpenBSD__
+	if (pledge("stdio", NULL) == -1) {
+		perror(argv[0] == NULL ? program_name : argv[0]);
+
+		return EX_OSERR;
+	}
+#endif
 
 	if (argc < 3) {
 		(void)fprintf(

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,5 +1,6 @@
 /*
  * Copyright (c) 2023–2024 Emma Tebibyte <emma@tebibyte.media>
+ * Copyright (c) 2024 DTB <trinity@trinity.moe>
  * SPDX-License-Identifier: CC0
  *
  * This work is marked with CC0 1.0. To view a copy of this license, visit
@@ -10,7 +11,7 @@
 #	include <unistd.h> /* pledge(2) */
 #endif
 
-int main() {
+int main(void) {
 #ifdef __OpenBSD__
 	pledge(NULL, NULL);
 #endif

tests/bonsai/intcmp.mk

@@ -7,7 +7,7 @@
 # notice are preserved.  This file is offered as-is, without any warranty.
 
 .PHONY: intcmp_tests
-intcmp_tests: intcmp_help intcmp_e intcmp_g intcmp_l intcmp_combined
+intcmp_tests: intcmp_help intcmp_none intcmp_e intcmp_g intcmp_l intcmp_combined
 
 .PHONY: intcmp_help
 intcmp_help: $(BIN)/intcmp
@@ -31,6 +31,10 @@ intcmp_help: $(BIN)/intcmp
 # 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    # ==

tests/bonsai/mm.mk

@@ -5,13 +5,13 @@
 # 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 = mm
-TARGET = $(NAME)_tests
-BINARY = $(BIN)/$(NAME)
-
 .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
@@ -24,4 +24,4 @@ mm_help: $(BIN)/mm
 .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"
+	test "$$(printf 'test\n' | $(BIN)/mm -e 2>&1 >/dev/null )" = "test"

tests/bonsai/rpn.mk

@@ -6,7 +6,7 @@
 # notice are preserved.  This file is offered as-is, without any warranty.
 
 .PHONY: rpn_tests
-rpn_tests: rpn_help rpn_add
+rpn_tests: rpn_help rpn_add rpn_sub rpn_mul rpn_div rpn_mod rpn_flr
 
 .PHONY: rpn_help
 rpn_help: $(BIN)/rpn
@@ -20,7 +20,7 @@ rpn_add: $(BIN)/rpn
 .PHONY: rpn_sub
 rpn_sub: $(BIN)/rpn
 	test "$$($(BIN)/rpn 23 5 -)" -eq 18
-	test "$$($(BIN)/rpn 0.3 0.1)" = 0.2
+	test "$$($(BIN)/rpn 0.3 0.1 -)" = 0.2
 
 .PHONY: rpn_mul
 rpn_mul: $(BIN)/rpn