Merge branch 'fop-trim' (closes #54, closes #58)

.editorconfig

@@ -12,6 +12,3 @@ indent_size = 2
 
 [*.sh]
 indent_size = 2
-
-[configure]
-indent_size = 2

.gitignore

@@ -1,3 +1,2 @@
 build/
 dist/
-*.mk

Makefile

@@ -17,7 +17,7 @@ CC=cc
 RUSTC=rustc
 
 .PHONY: all
-all: dj false fop intcmp scrut str strcmp true
+all: dj false fop intcmp rpn scrut str strcmp true
 
 build:
 	# keep build/include until bindgen(1) has stdin support
@@ -40,7 +40,6 @@ install: dist
 
 .PHONY: test
 test: build
-	tests/cc-compat.sh
 	tests/posix-compat.sh
 	$(RUSTC) --test src/getopt-rs/lib.rs -o build/test/getopt
 
@@ -55,7 +54,7 @@ build/o/libsysexits.rlib: build
 		| $(RUSTC) $(RUSTFLAGS) --crate-type lib -o build/o/libsysexits.rlib -
 
 build/o/libgetopt.rlib: src/getopt-rs/lib.rs
-	$(RUSTC) $(RUSTCFLAGS) --crate-type=lib --crate-name=getopt \
+	$(RUSTC) $(RUSTFLAGS) --crate-type=lib --crate-name=getopt \
 		-o build/o/libgetopt.rlib src/getopt-rs/lib.rs
 
 .PHONY: dj

README

@@ -17,6 +17,31 @@ purposes beyond its scope.
 
 See docs/ for more on the specific utilities currently implemented.
 
+Building
+
+The coreutils require a POSIX-compliant environment to compile, including a C
+compiler and preprocessor (cc(1) and cpp(1) by default) with the -idirafter
+flag, a Rust compiler (rustc(1) by default), bindgen(1), and a POSIX-compliant
+make(1) utility.
+
+To build and install:
+
+$ make
+$ make PREFIX="/your/preferred/location" install
+
+To build with a different compiler than the default:
+
+$ make CC=clang
+$ make RUSTC=gccrs
+
+To test the utilities:
+
+$ make test
+
+To remove all untracked files:
+
+$ make clean
+
 Read More
 
 An Introduction to the Unix Shell
@@ -30,3 +55,10 @@ Master Foo Discourses on the Unix-Nature
 
 Shell Programming!
 <https://tldp.org/LDP/abs/html/why-shell.html>
+
+--
+Copyright © 2023–2024 Emma Tebibyte <emma@tebibyte.media>
+Copyright © 2024 DTB <trinity@trinity.moe>
+
+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/>.

docs/scrut.1

@@ -0,0 +1,93 @@
+.\" Copyright (c) 2024 DTB <trinity@trinity.moe>
+.\"
+.\" This work is licensed under CC BY-SA 4.0. To see a copy of this license,
+.\" visit <http://creativecommons.org/licenses/by-sa/4.0/>.
+
+.TH scrut 1
+
+.SH NAME
+
+scrut \(en scrutinize file properties
+
+.SH SYNOPSIS
+
+scrut
+.RB ( -bcdefgkprsuwxLS )
+.RB [ file... ]
+
+.SH DESCRIPTION
+
+Scrut determines if given files comply with the opted requirements.
+
+.SH OPTIONS
+
+.B -b
+requires the given files to exist and be block special files.
+.PP
+.B -c
+requires the given files to exist and be character special files.
+.PP
+.B -d
+requires the given files to exist and be directories.
+.PP
+.B -e
+requires the given files to exist, and is redundant to any other option.
+.PP
+.B -e
+requires the given files to exist and be regular files.
+.PP
+.B -g
+requires the given files to exist and have their set group ID flags set.
+.PP
+.B -k
+requires the given files to exist and have their sticky bit set.
+.PP
+.B -p
+requires the given files to exist and be named pipes.
+.PP
+.B -r
+requires the given files to exist and be readable.
+.PP
+.B -u
+requires the given files to exist and have their set user ID flags set.
+.PP
+.B -w
+requires the given files to exist and be writable.
+.PP
+.B -x
+requires the given files to exist and be executable.
+.PP
+.B -L
+requires the given files to exist and be symbolic links.
+.PP
+.B -S
+requires the given files to exist and be sockets.
+
+.SH EXIT STATUS
+
+Scrut prints a debug message and exits unsuccessfully with the appropriate
+sysexits.h(3) error code if invoked incorrectly. Scrut exits successfully if
+the given files comply with their requirements and unsuccessfully otherwise.
+
+.SH STANDARDS
+
+Scrut is nearly compatible with POSIX's test utility though it is narrower in
+scope. Notably, the
+.B -h
+option is now invalid and therefore shows usage information instead of being an
+alias to the modern
+.B -L
+option.
+
+.SH AUTHOR
+
+Written by DTB <trinity@trinity.moe>.
+
+.SH COPYRIGHT
+
+Copyright © 2024 DTB. License AGPLv3+: GNU AGPL version 3 or later
+<https://gnu.org/licenses/agpl.html>.
+
+.SH SEE ALSO
+
+access(3p), lstat(3p), test(1p)

src/fop.rs

@@ -18,7 +18,7 @@
 
 use std::{
 	env::args,
-	io::{ Read, stdin, Write },
+	io::{ Read, stdin, stdout, Write },
 	process::{ Command, exit, Stdio },
 };
 
@@ -26,7 +26,7 @@ extern crate sysexits;
 extern crate getopt;
 
 use getopt::{ Opt, Parser };
-use sysexits::{ EX_DATAERR, EX_USAGE };
+use sysexits::{ EX_DATAERR, EX_IOERR, EX_UNAVAILABLE, EX_USAGE };
 
 fn main() {
 	let argv = args().collect::<Vec<String>>();
@@ -54,43 +54,65 @@ fn main() {
 		exit(EX_USAGE);
 	});
 
-	let index = argv[index_arg].parse::<usize>().unwrap_or_else(|_| {
+	let index = argv[index_arg].parse::<usize>().unwrap_or_else(|e| {
-		eprintln!("{}: {}: Not an integer.", argv[0], argv[1]);
+		eprintln!("{}: {}: {}.", argv[0], argv[1], e);
 		exit(EX_DATAERR);
 	});
 
 	let mut buf = String::new();
-	stdin().read_to_string(&mut buf).unwrap();
+	let _ = stdin().read_to_string(&mut buf);
 	let mut fields = buf.split(d).collect::<Vec<&str>>();
 
-	let opts = argv.iter().clone().skip(command_arg + 1).collect::<Vec<&String>>();
+	let opts = argv
+		.iter()
+		.clone()
+		.skip(command_arg + 1)
+		.collect::<Vec<&String>>();
 
 	let mut spawned = Command::new(argv.get(command_arg).unwrap())
 		.args(opts)
 		.stdin(Stdio::piped())
 		.stdout(Stdio::piped())
 		.spawn()
-		.unwrap();
+		.unwrap_or_else( |e| {
+			eprintln!("{}: {}: {}.", argv[0], argv[command_arg], e);
+			exit(EX_UNAVAILABLE);
+		});
 
 	let field = fields.get(index).unwrap_or_else(|| {
 		eprintln!(
 			"{}: {}: No such index in input.",
 			argv[0],
-			index.to_string()
+			index.to_string(),
 		);
 		exit(EX_DATAERR);
 	});
 
 	if let Some(mut child_stdin) = spawned.stdin.take() {
-		child_stdin.write_all(field.as_bytes()).unwrap();
+		let _ = child_stdin.write_all(field.as_bytes());
 		drop(child_stdin);
 	}
 
-	let output = spawned.wait_with_output().unwrap();
+	let output = spawned.wait_with_output().unwrap_or_else(|e| {
+		eprintln!("{}: {}: {}.", argv[0], argv[command_arg], e);
+		exit(EX_IOERR);
+	});
 
-	let new_field = String::from_utf8(output.stdout).unwrap();
+	let mut replace = output.stdout.clone();
+
+	if replace.pop() != Some(b'\n') { replace = output.stdout; }
+
+	let new_field = String::from_utf8(replace).unwrap_or_else(|e| {
+		eprintln!("{}: {}: {}.", argv[0], argv[command_arg], e);
+		exit(EX_IOERR);
+	});
 
 	fields[index] = &new_field;
 
-	print!("{}", fields.join(&d.to_string()));
+	stdout().write_all(
+		fields.join(&d.to_string()).as_bytes()
+	).unwrap_or_else(|e|{
+		eprintln!("{}: {}.", argv[0], e);
+		exit(EX_IOERR);
+	});
 }

src/rpn.rs

@@ -165,7 +165,7 @@ fn eval(
 						Subtract => stack.push_back(y - x),
 						Multiply => stack.push_back(y * x),
 						Divide => stack.push_back(y / x),
-						Power => stack.push_back(x.powf(y)),
+						Power => stack.push_back(y.powf(x)),
 						Floor => stack.push_back((y / x).floor()),
 						Modulo => stack.push_back(y % x),
 						_ => {},

src/scrut.c

@@ -18,7 +18,7 @@
 
 #include <stdio.h> /* fprintf(3), stderr, NULL */
 #include <stdlib.h> /* EXIT_FAILURE */
-#include <string.h> /* strchr(3) */
+#include <string.h> /* memset(3), strchr(3) */
 #include <unistd.h> /* access(3), getopt(3), 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,
@@ -33,17 +33,24 @@ int main(int argc, char *argv[]){
 	struct stat buf;
 	int c;
 	size_t i;
+	char *p;
 
 	if(argc < 2)
 		goto usage;
 
-	i = 0;
+	memset(ops, '\0', sizeof ops);
 	while((c = getopt(argc, argv, args)) != -1)
-		if(strchr(args, c) == NULL)
+		if((p = strchr(args, c)) == NULL)
 			goto usage;
 		else
-			ops[i++] = c;
+			ops[p - args] = c;
-	ops[i] = '\0';
+	/* straighten out ops */
+	for(i = 0, p = ops; i < (sizeof ops) / (sizeof *ops); ++i)
+		if(ops[i] != '\0'){
+			*p = ops[i];
+			if(&ops[i] != p++)
+				ops[i] = '\0';
+		}
 
 	if(optind == argc)
 		goto usage;

tests/cc-compat.sh

@@ -1,40 +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 64 # sysexits.h(3) EX_USAGE
-fi
-
-make clean
-./configure clean
-./configure
-
-for CC in cc \
-	clang \
-	gcc \
-	'zig cc'
-do
-	export CC
-
-	command -v "$(printf '%s\n' "$CC" | cut -d ' ' -f1)" >/dev/null 2>&1 \
-		|| continue
-
-	printf '%s: %s: Testing build.\n' "$0" "$CC"
-
-	make CC="$CC" && printf '%s: Build successful.\n' "$0"
-
-	ls -lA build/bin
-
-	make clean
-	printf '\n'
-done