Merge branch 'scrut-fix'

.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
 

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/>.

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[i] = '\0';
+			ops[p - args] = c;
+	/* 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