Testfile: make non-executable

Makefile

@@ -1,44 +1,116 @@
 # Copyright (c) 2023–2024 Emma Tebibyte <emma@tebibyte.media>
 # Copyright (c) 2023–2024 DTB <trinity@trinity.moe>
 # Copyright (c) 2023 Sasha Koshka <sashakoshka@tebibyte.media>
-# Copyright (c) 2024 Aaditya Aryal <aryalaadi123@gmail.com>
 # 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.
 
-#.POSIX:
+.POSIX:
+.PRAGMA: posix_202x # future POSIX standard support à la pdpmake(1)
+.PRAGMA: command_comment # breaks without this?
 
-include config.mk
+PREFIX=/usr/local
+
+CC=cc
+MAKE=make
+RUSTC=rustc
 
 .PHONY: all
-all: prepare
+all: dj false fop hru intcmp rpn scrut str strcmp true
-	@$(MAKE) -C lib
-	@$(MAKE) -C bin
 
-
+build:
-.PHONY: prepare 
-prepare:
 	# keep build/include until bindgen(1) has stdin support
 	# https://github.com/rust-lang/rust-bindgen/issues/2703
 	mkdir -p build/bin build/include build/lib build/o build/test
 
 .PHONY: clean
 clean:
-	rm -rf build dist
+	rm -rf build/ dist/
 
 dist: all
-	mkdir -p $(DESTDIR)/$(PREFIX)/bin $(DESTDIR)/$(PREFIX)/share/man/man1
+	mkdir -p dist/bin dist/share/man/man1
-	cp build/bin/* $(DESTDIR)/$(PREFIX)/bin
+	cp build/bin/* dist/bin/
-	cp bin/*/*.1 $(DESTDIR)/$(PREFIX)/share/man/man1
+	cp docs/*.1 dist/share/man/man1/
-
 
 .PHONY: install
 install: dist
-	cp -r $(DESTDIR)/* /
+	mkdir -p $(PREFIX)
+	cp -r dist/* $(PREFIX)/
 
 .PHONY: test
-test: prepare
+test: build
 	tests/posix-compat.sh
 	$(RUSTC) --test src/getopt-rs/lib.rs -o build/test/getopt
+	$(MAKE) -f Testfile
+
+build/o/libsysexits.rlib: build
+	# bandage solution until bindgen(1) gets stdin support
+	printf '#define EXIT_FAILURE 1\n' | cat - include/sysexits.h \
+		> build/include/sysexits.h 
+	bindgen --default-macro-constant-type signed --use-core --formatter=none \
+		"$$(printf '#include <sysexits.h>\n' \
+			| cpp -M -idirafter "build/include" - \
+			| sed 's/ /\n/g' | grep sysexits.h)" \
+		| $(RUSTC) $(RUSTFLAGS) --crate-type lib -o build/o/libsysexits.rlib -
+
+build/o/libgetopt.rlib: src/getopt-rs/lib.rs
+	$(RUSTC) $(RUSTFLAGS) --crate-type=lib --crate-name=getopt \
+		-o build/o/libgetopt.rlib src/getopt-rs/lib.rs
+
+.PHONY: dj
+dj: build/bin/dj
+build/bin/dj: src/dj.c build
+	$(CC) $(CFLAGS) -o $@ src/dj.c
+
+.PHONY: false
+false: build/bin/false
+build/bin/false: src/false.c build
+	$(CC) $(CFLAGS) -o $@ src/false.c
+
+.PHONY: fop
+fop: build/bin/fop
+build/bin/fop: src/fop.rs build build/o/libgetopt.rlib build/o/libsysexits.rlib
+	$(RUSTC) $(RUSTFLAGS) --extern getopt=build/o/libgetopt.rlib \
+		--extern sysexits=build/o/libsysexits.rlib \
+		-o $@ src/fop.rs
+
+.PHONY: hru
+hru: build/bin/hru
+build/bin/hru: src/hru.rs build build/o/libgetopt.rlib build/o/libsysexits.rlib
+	$(RUSTC) $(RUSTFLAGS) --extern getopt=build/o/libgetopt.rlib \
+		--extern sysexits=build/o/libsysexits.rlib \
+		-o $@ src/hru.rs
+
+.PHONY: intcmp
+intcmp: build/bin/intcmp
+build/bin/intcmp: src/intcmp.c build
+	$(CC) $(CFLAGS) -o $@ src/intcmp.c
+
+.PHONY: rpn
+rpn: build/bin/rpn
+build/bin/rpn: src/rpn.rs build build/o/libsysexits.rlib
+	$(RUSTC) $(RUSTFLAGS) \
+		--extern sysexits=build/o/libsysexits.rlib \
+		-o $@ src/rpn.rs
+
+.PHONY: scrut
+scrut: build/bin/scrut
+build/bin/scrut: src/scrut.c build
+	$(CC) $(CFLAGS) -o $@ src/scrut.c
+
+.PHONY: str
+str: build/bin/str
+build/bin/str: src/str.c build
+	$(CC) $(CFLAGS) -o $@ src/str.c
+
+.PHONY: strcmp
+strcmp: build/bin/strcmp
+build/bin/strcmp: src/strcmp.c build
+	$(CC) $(CFLAGS) -o $@ src/strcmp.c
+
+.PHONY: true
+true: build/bin/true
+build/bin/true: src/true.c build
+	$(CC) $(CFLAGS) -o $@ src/true.c

Testfile

@@ -0,0 +1,78 @@
+#!/usr/bin/env make
+# 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.
+
+BIN = build/bin
+MAKE = make -B
+
+DEFENDANTS = dj false intcmp strcmp true
+.PHONY: all $(DEFENDANTS)
+all: $(DEFENDANTS)
+
+$(BIN)/dj:
+	$(MAKE) dj
+
+$(BIN)/false:
+	$(MAKE) false
+
+$(BIN)/intcmp:
+	$(MAKE) intcmp
+
+$(BIN)/strcmp:
+	$(MAKE) strcmp
+
+$(BIN)/true:
+	$(MAKE) true
+
+dj: $(BIN)/dj $(BIN)/strcmp
+	sh -c "! $(BIN)/dj -h"
+	# This test is theoretically Linux-dependent; write(2) should return -1 on
+	# error.
+	# Right now dj(1) interprets the return value of write(2) as the amount of
+	# bytes written. This can decrement the stored quantity of bytes written,
+	# which is an int, so doesn't underflow but goes negative. dj(1) tries to
+	# again to write(2) if an error occurs in which no bytes are written, so in
+	# total two write(2)s are attempted and so the written byte quantity is -2.
+	# This is a bug and will change, but for now is at least documented.
+	sh -ec "\
+		$(BIN)/dj -Hi /dev/zero -o /dev/full \
+		| xargs -I out $(BIN)/strcmp '1+0 > 0+0; 1024 > -2' out"
+	# Read nothing from /dev/null, write nothing to /dev/null.
+	sh -ec "\
+		$(BIN)/dj -Hi /dev/null -o /dev/null \
+		| xargs -I out $(BIN)/strcmp '0+0 > 0+0; 0 > 0' out"
+
+false: $(BIN)/false
+	sh -c "! $(BIN)/false"
+	sh -c "! $(BIN)/false -h"
+
+intcmp: $(BIN)/intcmp
+	$(BIN)/intcmp -e   3 3 3
+	$(BIN)/intcmp -g   3 2 1
+	$(BIN)/intcmp -l   1 2 3
+	$(BIN)/intcmp -ge  3 3 1
+	$(BIN)/intcmp -le  1 3 3
+	$(BIN)/intcmp -gl  1 2 3
+	$(BIN)/intcmp -egl 3 1 1 2
+	sh -c "! $(BIN)/intcmp -e   1 2 3"
+	sh -c "! $(BIN)/intcmp -g   1 3 3"
+	sh -c "! $(BIN)/intcmp -l   3 3 1"
+	sh -c "! $(BIN)/intcmp -ge  1 2 3"
+	sh -c "! $(BIN)/intcmp -le  3 2 1"
+	sh -c "! $(BIN)/intcmp -gl  3 3 3"
+	sh -c "! $(BIN)/intcmp -egl foo"
+
+strcmp: $(BIN)/strcmp
+	$(BIN)/strcmp equals equals
+	sh -c "! $(BIN)/strcmp inequals equals"
+	$(BIN)/strcmp - -
+	sh -c "! $(BIN)/strcmp -h"
+	sh -c "! $(BIN)/strcmp nocmp"
+
+true:
+	$(BIN)/true
+	$(BIN)/true -h

bin/Makefile

@@ -1,91 +0,0 @@
-# Copyright (c) 2023–2024 Emma Tebibyte <emma@tebibyte.media>
-# Copyright (c) 2023–2024 DTB <trinity@trinity.moe>
-# Copyright (c) 2023 Sasha Koshka <sashakoshka@tebibyte.media>
-# Copyright (c) 2024 Aaditya Aryal <aryalaadi123@gmail.com>
-# 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 ../config.mk
-
-.PHONY: bin
-bin: dj false fop hru intcmp mm npc rpn scrut str strcmp swab true
-
-.PHONY: lib
-
-# TODO: this does not have to be here
-.PHONY: prepare
-prepare:
-	# keep ..$(BUILD)/include until bindgen(1) has stdin support
-	# https://github.com/rust-lang/rust-bindgen/issues/2703
-	mkdir -p ../$(BUILD)/bin ../$(BUILD)/include ../$(BUILD)/lib
-	mkdir -p ../$(BUILD)/test  ../$(BUILD)/o 
-
-.PHONY: dj
-dj: ../$(BUILD)/bin/dj
-../$(BUILD)/bin/dj: dj/dj.c prepare
-	$(CC) $(CFLAGS) -o $@ dj/dj.c
-
-.PHONY: false
-false: ../$(BUILD)/bin/false
-../$(BUILD)/bin/false: false/false.c prepare
-	$(CC) $(CFLAGS) -o $@ false/false.c
-
-.PHONY: fop
-fop: ../$(BUILD)/bin/fop
-../$(BUILD)/bin/fop: fop/fop.rs prepare lib
-	$(RUSTC) $(RUSTFLAGS) $(RUSTLIBS) -o $@ fop/fop.rs
-
-.PHONY: hru
-hru: ../$(BUILD)/bin/hru
-../$(BUILD)/bin/hru: hru/hru.rs prepare lib 
-	$(RUSTC) $(RUSTFLAGS) $(RUSTLIBS) -o $@ hru/hru.rs
-
-.PHONY: intcmp
-intcmp: ../$(BUILD)/bin/intcmp
-../$(BUILD)/bin/intcmp: intcmp/intcmp.c prepare
-	$(CC) $(CFLAGS) -o $@ intcmp/intcmp.c
-
-.PHONY: mm
-mm: ../$(BUILD)/bin/mm
-../$(BUILD)/bin/mm: mm/mm.c prepare
-	$(CC) $(CFLAGS) -o $@ mm/mm.c
-
-.PHONY: npc
-npc: ../$(BUILD)/bin/npc
-../$(BUILD)/bin/npc: npc/npc.c prepare
-	$(CC) $(CFLAGAS) -o $@ npc/npc.c
-
-.PHONY: rpn
-rpn: ../$(BUILD)/bin/rpn
-../$(BUILD)/bin/rpn: rpn/rpn.rs prepare lib
-	$(RUSTC) $(RUSTFLAGS) $(RUSTLIBS) -o $@ rpn/rpn.rs
-
-.PHONY: scrut
-scrut: ../$(BUILD)/bin/scrut
-../$(BUILD)/bin/scrut: scrut/scrut.c prepare
-	$(CC) $(CFLAGS) -o $@ scrut/scrut.c
-
-.PHONY: str
-str: ../$(BUILD)/bin/str
-../$(BUILD)/bin/str: str/str.c prepare
-	$(CC) $(CFLAGS) -o $@ str/str.c
-
-.PHONY: strcmp
-strcmp: ../$(BUILD)/bin/strcmp
-../$(BUILD)/bin/strcmp: strcmp/strcmp.c prepare
-	$(CC) $(CFLAGS) -o $@ strcmp/strcmp.c
-
-.PHONY: swab
-swab: ../$(BUILD)/bin/swab
-../$(BUILD)/bin/swab: swab/swab.rs prepare lib
-	$(RUSTC) $(RUSTFLAGS) --extern getopt=../$(BUILD)/o/libgetopt.rlib \
-		--extern sysexits=../$(BUILD)/o/libsysexits.rlib \
-		-o $@ swab/swab.rs
-
-.PHONY: true
-true: ../$(BUILD)/bin/true
-../$(BUILD)/bin/true: true/true.c prepare
-	$(CC) $(CFLAGS) -o $@ true/true.c

bin/mm/mm.1

@@ -1,76 +0,0 @@
-.\" 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 mm 1
-
-.SH NAME
-
-mm \(en middleman
-
-.SH SYNOPSIS
-
-mm
-.RB ( -aenu )
-.RB ( -i
-.RB [ input ])
-.RB ( -o
-.RB [ output ])
-
-.SH DESCRIPTION
-
-Mm catenates input files and writes them to the start of each output file.
-
-.SH OPTIONS
-
-Mm, upon receiving the
-.B -a
-option, will open subsequent outputs for appending rather than updating.
-.PP
-The
-.B -i
-option opens a path as an input. Without any inputs specified mm will use
-standard input. Standard input itself can be specified by giving the path '-'.
-.PP
-The
-.B -o
-option opens a path as an output. Without any outputs specified mm will use
-standard output. Standard output itself can be specified by giving the
-path '-'. Standard error itself can be specified with the
-.B -e
-option.
-.PP
-The
-.B -u
-option ensures neither input or output will be buffered.
-.PP
-The
-.B -n
-option tells mm to ignore SIGINT signals.
-
-.SH DIAGNOSTICS
-
-If an output can no longer be written mm prints a diagnostic message, ceases
-writing to that particular output, and if there are more outputs specified,
-continues, eventually exiting unsuccessfully.
-.PP
-On error mm prints a diagnostic message and exits with the appropriate
-sysexits.h(3) status.
-
-.SH BUGS
-
-Mm does not truncate existing files, which may lead to unexpected results.
-
-.SH RATIONALE
-
-Mm was modeled after the cat and tee utilities specified in POSIX.
-
-.SH COPYRIGHT
-
-Copyright (c) 2024 DTB. License AGPLv3+: GNU AGPL version 3 or later
-<https://gnu.org/licenses/agpl.html>.
-
-.SH SEE ALSO
-
-cat(1p), dd(1), dj(1), tee(1p)

bin/mm/mm.c

@@ -1,224 +0,0 @@
-/*
- * Copyright (c) 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 <errno.h> /* errno */
-#include <signal.h> /* signal(2), SIG_ERR, SIG_IGN, SIGINT */
-#include <stdio.h> /* fclose(3), fopen(3), fprintf(3), getc(3), putc(3),
-                    * setvbuf(3), size_t, _IONBF, NULL */
-#include <stdlib.h> /* free(3), realloc(3) */
-#include <string.h> /* strcmp(3), strerror(3) */
-#include <unistd.h> /* getopt(3) */
-#if !defined EX_IOERR || !defined EX_OK || !defined EX_OSERR \
-		|| !defined EX_USAGE
-#	include <sysexits.h>
-#endif
-extern int errno;
-
-/* This structure is how open files are tracked. */
-struct Files{
-	size_t a;	/* allocation */
-	size_t s;	/* used size */
-	char *mode;	/* file opening mode */
-	char **names;	/* file names */
-	FILE **files;	/* file pointers */
-};
-
-/* How much to grow the allocation when it's saturated. */
-#ifndef ALLOC_INCREMENT
-#	define ALLOC_INCREMENT 1
-#endif
-
-/* How much to grow the allocation at program start. */
-#ifndef ALLOC_INITIAL
-#	define ALLOC_INITIAL 10
-#endif
-
-/* pre-allocated strings */
-static char *program_name = "<no argv[0]>";
-static char *stdin_name = "<stdin>";
-static char *stdout_name = "<stdout>";
-static char *stderr_name = "<stderr>";
-static char *(fmode[]) = { (char []){"rb"}, (char []){"rb+"} };
-static char *wharsh = "wb";
-
-/* Adds the open FILE pointer for the file at the path s to the files struct,
- * returning the FILE if successful and NULL if not, allocating more memory in
- * the files buffers as needed. */
-static FILE *
-Files_append(struct Files *files, FILE *file, char *name){
-
-	if(file == NULL || (files->s == files->a
-			&& ((files->files = realloc(files->files,
-					(files->a += (files->a == 0)
-						? ALLOC_INITIAL
-						: ALLOC_INCREMENT)
-					* sizeof *(files->files))) == NULL
-				|| (files->names = realloc(files->names,
-					files->a * sizeof *(files->names))) == NULL)))
-		return NULL;
-
-	files->names[files->s] = name;
-	return files->files[files->s++] = file;
-}
-
-/* Opens the file at the path p and puts it in the files struct, returning NULL
- * if either the opening or the placement of the open FILE pointer fail. */
-#define Files_open(files, p) \
-	Files_append((files), fopen((p), (files)->mode), (p))
-
-/* Prints a diagnostic message based on errno and returns an exit status
- * appropriate for an OS error. */
-static int
-oserr(char *s, char *r){
-
-	fprintf(stderr, "%s: %s: %s\n", s, r, strerror(errno));
-
-	return EX_OSERR;
-}
-
-/* Hijacks i and j from main and destructs the files[2] struct used by main by
- * closing its files and freeing its files and names arrays, returning retval
- * from main. */
-#define terminate \
-	for(i = 0; i < 2; ++i){ \
-		for(j = 0; j < files[i].s; ++j) \
-			if(files[i].files[j] != stdin \
-					&& files[i].files[j] != stdout \
-					&& files[i].files[j] != stderr) \
-				fclose(files[i].files[j]); \
-		free(files[i].files); \
-		free(files[i].names); \
-	} \
-	return retval
-
-int main(int argc, char *argv[]){
-	int c;
-	struct Files files[2]; /* {read, write} */
-	size_t i;
-	size_t j;
-	size_t k; /* loop index but also unbuffer status */
-	int retval;
-
-	/* Initializes the files structs with their default values, standard
-	 * input and standard output. If an input or an output is specified
-	 * these initial values will be overwritten, so to, say, use mm(1)
-	 * equivalently to tee(1p), -o - will need to be specified before
-	 * additional files to ensure standard output is still written. */
-	for(i = 0; i < 2; ++i){
-		files[i].a = 0;
-		files[i].s = 0;
-		files[i].mode = fmode[i];
-		files[i].files = NULL;
-		files[i].names = NULL;
-		Files_append(&files[i], i == 0 ? stdin : stdout,
-			i == 0 ? stdin_name : stdout_name);
-		files[i].s = 0;
-	}
-
-	k = 0;
-
-	if(argc > 0)
-		program_name = argv[0];
-
-	if(argc > 1)
-		while((c = getopt(argc, argv, "aehi:no:u")) != -1)
-			switch(c){
-			case 'a': /* "rb+" -> "ab" */
-				files[1].mode[0] = 'a';
-				files[1].mode[2] = '\0';
-				break;
-			case 'e':
-				if(Files_append(&files[1], stderr, stderr_name) != NULL)
-					break;
-				retval = oserr(argv[0], "-e");
-				terminate;
-			case 'i':
-				if((strcmp(optarg, "-") == 0 && Files_append(&files[0],
-							stdin, stdin_name) != NULL)
-						|| Files_open(&files[0], optarg) != NULL)
-					break;
-				retval = oserr(argv[0], optarg);
-				terminate;
-			case 'o':
-				if((strcmp(optarg, "-") == 0 && Files_append(&files[1],
-							stdout, stdout_name) != NULL)
-						|| Files_open(&files[1], optarg) != NULL)
-					break;
-				/* does not exist, so try to create it */
-				if(errno == ENOENT){
-					files[1].mode = wharsh;
-					if(Files_open(&files[1], optarg) != NULL){
-						files[1].mode = fmode[1];
-						break;
-					}
-				}
-				retval = oserr(argv[0], optarg);
-				terminate;
-			case 'n':
-				if(signal(SIGINT, SIG_IGN) != SIG_ERR)
-					break;
-				retval = oserr(argv[0], "-n");
-				terminate;
-			case 'u':
-				k = 1;
-				break;
-			default:
-				fprintf(stderr, "Usage: %s (-aenu) (-i [input])..."
-					" (-o [output])...\n", argv[0]);
-				retval = EX_USAGE;
-				terminate;
-			}
-
-	files[0].s += files[0].s == 0;
-	files[1].s += files[1].s == 0;
-	
-	/* Unbuffer files. */
-	if(k){
-		for(i = 0;
-			i < files[0].s;
-			setvbuf(files[0].files[i++], NULL, _IONBF, 0));
-		for(i = 0;
-			i < files[1].s;
-			setvbuf(files[1].files[i++], NULL, _IONBF, 0));
-	}
-
-	retval = EX_OK;
-
-	/* Actual program loop. */
-	for(i = 0; i < files[0].s; ++i) /* iterate ins */
-		while((c = getc(files[0].files[i])) != EOF) /* iterate chars */
-			for(j = 0; j < files[1].s; ++j) /* iterate outs */
-				if(putc(c, files[1].files[j]) == EOF){
-					/* notebook's full */
-					retval = EX_IOERR;
-					fprintf(stderr, "%s: %s: %s\n",
-						program_name, files[1].names[j], strerror(errno));
-					if(fclose(files[1].files[j]) == EOF)
-						fprintf(stderr, "%s: %s: %s\n",
-							program_name, files[1].names[j], strerror(errno));
-					/* massage out the tense muscle */
-					for(k = j--; k < files[1].s - 1; ++k){
-						files[1].files[k] = files[1].files[k+1];
-						files[1].names[k] = files[1].names[k+1];
-					}
-					if(--files[1].s == 0)
-						terminate;
-				}
-
-	terminate;
-}

bin/swab/swab.1

@@ -1,71 +0,0 @@
-.\" 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 swab 1
-
-.SH NAME
-
-swab \(en swap bytes
-
-.SH SYNOPSIS
-
-swab
-.RB ( -f )
-.RB ( -w
-.R [
-.B word size
-.R ])
-
-.SH USAGE
-
-Swab swaps the latter and former halves of a block of bytes.
-
-.SH EXAMPLES
-
-The following sh(1p) line:
-
-.R printf 'hello world!\n' | swab
-
-Produces the following output:
-
-.R ehll oowlr!d
-
-.SH OPTIONS
-
-The
-.B -f
-option ignores system call interruptions.
-.PP
-The
-.B -w
-option configures the word size; that is, the size in bytes of the block size
-on which to operate. By default the word size is 2. The word size must be
-cleanly divisible by 2, otherwise the block of bytes being processed can't be
-halved.
-
-.SH DIAGNOSTICS
-
-If an error is encountered in input, output, or invocation, a diagnostic
-message will be written to standard error and swab will exit with the
-appropriate status from sysexits.h(3).
-
-.SH RATIONALE
-
-Swab was modeled after the
-.R conv=swab
-functionality specified in the POSIX dd utility but additionally allows the
-word size to be configured.
-.PP
-Swab is useful for fixing the endianness of binary files produced on other
-machines.
-
-.SH COPYRIGHT
-
-Copyright (c) 2024 DTB. License AGPLv3+: GNU AGPL version 3 or later
-<https://gnu.org/licenses/agpl.html>.
-
-.SH SEE ALSO
-
-dd(1p)

bin/swab/swab.rs

@@ -1,90 +0,0 @@
-/*
- * Copyright (c) 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::{ stdin, stdout, Error, ErrorKind, Read, Write },
-	process::ExitCode,
-	vec::Vec
-};
-
-extern crate getopt;
-use getopt::{ Opt, Parser };
-
-extern crate sysexits;
-use sysexits::{ EX_OK, EX_OSERR, EX_USAGE };
-
-fn oserr(s: &str, e: Error) -> ExitCode {
-	eprintln!("{}: {}", s, e);
-	ExitCode::from(EX_OSERR as u8)
-}
-
-fn usage(s: &str) -> ExitCode {
-	eprintln!("Usage: {} (-f) (-w [wordsize])", s);
-	ExitCode::from(EX_USAGE as u8)
-}
-
-fn main() -> ExitCode {
-	let argv = args().collect::<Vec<String>>();
-	let mut buf: Vec<u8> = Vec::new();
-	let mut input = stdin();
-	let mut output = stdout().lock();
-
-	let mut opts = Parser::new(&argv, "fw:");
-	let mut force = false;
-	let mut wordsize: usize = 2;
-
-	loop {
-		match opts.next() {
-			None => break,
-			Some(opt) =>
-				match opt {
-					Ok(Opt('f', None)) => force = true,
-					Ok(Opt('w', Some(arg))) => {
-						match arg.parse::<usize>() {
-							Ok(w) if w % 2 == 0 => { wordsize = w; () },
-							_ => { return usage(&argv[0]); },
-						}
-					},
-					_ => { return usage(&argv[0]); }
-				}
-		}
-	}
-
-	buf.resize(wordsize, 0);
-
-	loop {
-		match input.read(&mut buf) {
-			Ok(0) => break ExitCode::from(EX_OK as u8),
-			Ok(v) if v == wordsize => {
-				let (left, right) = buf.split_at(v/2);
-				if let Err(e) = output.write(&right)
-						.and_then(|_| output.write(&left)) {
-					break oserr(&argv[0], e)
-				}
-			},
-			Ok(v) => {
-				if let Err(e) = output.write(&buf[..v]) {
-					break oserr(&argv[0], e)
-				}
-			},
-			Err(e) if e.kind() == ErrorKind::Interrupted && force => continue,
-			Err(e) => break oserr(&argv[0], e)
-		}
-	}
-}

bin/test/test.rs

@@ -1,10 +0,0 @@
-extern crate strerror;
-
-use strerror::raw_message;
-
-fn main() {
-	stdout.write_all(b"meow\n").unwrap_or_else(|e| {
-		eprintln!("{}", raw_message(e));
-		std::process::exit(1);
-	});
-}

config.mk

@@ -1,29 +0,0 @@
-# Copyright (c) 2023–2024 Emma Tebibyte <emma@tebibyte.media>
-# Copyright (c) 2023–2024 DTB <trinity@trinity.moe>
-# Copyright (c) 2023 Sasha Koshka <sashakoshka@tebibyte.media>
-# Copyright (c) 2024 Aaditya Aryal <aryalaadi123@gmail.com>
-# 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.
-
-# if using BSD make(1), remove these pragmas because they break it
-.PRAGMA: posix_202x # future POSIX standard support à la pdpmake(1)
-.PRAGMA: command_comment # breaks without this?
-
-DESTDIR ?= dist
-PREFIX ?= /usr/local
-BUILD ?= build
-
-SYSEXITS != printf '\043include <sysexits.h>\n' | cpp -M - | sed 's/ /\n/g' \
-	| 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
-
-CFLAGs += --std=c99 -Wall -pedantic -Werror
-CFLAGS += -I$(SYSEXITS)

lib/Makefile

@@ -1,30 +0,0 @@
-# Copyright (c) 2023–2024 Emma Tebibyte <emma@tebibyte.media>
-# Copyright (c) 2023–2024 DTB <trinity@trinity.moe>
-# Copyright (c) 2023 Sasha Koshka <sashakoshka@tebibyte.media>
-# Copyright (c) 2024 Aaditya Aryal <aryalaadi123@gmail.com>
-# 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 ../config.mk
-
-.PHONY: lib
-lib: ../$(BUILD)/o/libsysexits.rlib ../$(BUILD)/o/libgetopt.rlib \
-	../$(BUILD)/o/libstrerror.rlib
-
-../$(BUILD)/o/libgetopt.rlib: getopt-rs/lib.rs
-	$(RUSTC) $(RUSTFLAGS) --crate-type=lib --crate-name=getopt \
-		-o $@ getopt-rs/lib.rs
-
-../$(BUILD)/o/libstrerror.rlib: strerror.rs
-	$(RUSTC) $(RUSTFLAGS) --crate-type=lib -o $@ \
-		strerror.rs
-
-../$(BUILD)/o/libsysexits.rlib: $(SYSEXITS)sysexits.h
-	# bandage solution until bindgen(1) gets stdin support
-	printf '#define EXIT_FAILURE 1\n' | cat - $(SYSEXITS)sysexits.h \
-		> ../$(BUILD)/include/sysexits.h
-	bindgen --default-macro-constant-type signed --use-core --formatter=none \
-		../$(BUILD)/include/sysexits.h | $(RUSTC) $(RUSTFLAGS) --crate-type lib -o $@ -

lib/strerror.rs

@@ -1,31 +0,0 @@
-/*
- * 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.
- */
-
-use std::ffi::{ c_int, c_char, CStr };
-
-pub trait StrError { fn strerror(&self) -> String; }
-
-impl StrError for std::io::Error {
-	/* wrapper function for use in Rust */
-	fn strerror(&self) -> String {
-		/* Get the raw OS error. If it’s None, what the hell is going on‽ */
-		let errno = self.raw_os_error().unwrap_or(0) as c_int;
-
-		/* Get a CStr from the error message so that it’s referenced and then
-		 * convert it to an owned value. If the string is not valid UTF-8,
-		 * return that error instead. */
-		match unsafe { CStr::from_ptr(strerror(errno)) }.to_str() {
-			Ok(s) => s.to_owned(), // yay!! :D
-			Err(e) => e.to_string(), // awww :(
-		}
-	}
-}
-
-/* binding to strerror(3p) */
-extern "C" { fn strerror(errnum: c_int) -> *mut c_char; }

src/dj.c

@@ -203,28 +203,28 @@ Io_fdseek(struct Io *io){
 	
 	if(!fdisstd(io->fd) && lseek(io->fd, io->seek, SEEK_SET) != -1)
 		return -1;
-
+	else if(io->fl == write_flags){
-	/* repeated code to get the condition out of the loop */
-	if(io->fl == write_flags){
 		memset(io->buf, '\0', io->bs);
-		/* We're going to cheat and use bufuse as the retval for write(2),
+		/* This is a dirty trick; rather than testing conditions and operating
-		 * which is fine because it'll be zeroed as this function returns
+		 * likewise, because the parameters to read or write are going to be
-		 * anyway. */
+		 * the same either way, just use a function pointer to keep track of
-		do{
+		 * the intended operation. */
-			if((io->bufuse = write(io->fd, io->buf, MIN(io->bs, io->seek)))
+		op = (int (*)(int, void *, size_t))&write;
-					== 0)
+		/* Function pointer casts are risky; this works because the difference
-				/* second chance */
+		 * is in the second parameter and only that write(2) makes the buffer
-				io->bufuse = write(io->fd, io->buf, MIN(io->bs, io->seek));
+		 * const whereas read(2) does not. To avoid even the slightest
-		}while((io->seek -= io->bufuse) > 0 && io->bufuse != 0);
+		 * undefined behavior comment out the cast, just be ready for a
-	}else if(io->fl == read_flags){
+		 * -Wincompatible-function-pointer-types if your compiler notices it.
-		do{
+		 */
-			if((io->bufuse = read(io->fd, io->buf, MIN(io->bs, io->seek)))
-					== 0)
-				/* second chance */
-				io->bufuse = read(io->fd, io->buf, MIN(io->bs, io->seek));
-		}while((io->seek -= io->bufuse) > 0 && io->bufuse != 0);
 	}else
-		return EX_SOFTWARE;
+		op = &read;
+
+	/* We're going to cheat and use bufuse as the retval for write(2), which is
+	 * fine because it'll be zeroed as this function returns anyway. */
+	do{	if(	(io->bufuse = (*op)(io->fd, io->buf, MIN(io->bs, io->seek))) == 0)
+			/* second chance */
+			io->bufuse = (*op)(io->fd, io->buf, MIN(io->bs, io->seek));
+	}while((io->seek -= io->bufuse) > 0 && io->bufuse != 0);
 
 	io->bufuse = 0;
 

src/fop.rs

@@ -22,12 +22,10 @@ use std::{
 	process::{ Command, exit, Stdio },
 };
 
-extern crate getopt;
-extern crate strerror;
 extern crate sysexits;
+extern crate getopt;
 
 use getopt::{ Opt, Parser };
-use strerror::StrError;
 use sysexits::{ EX_DATAERR, EX_IOERR, EX_UNAVAILABLE, EX_USAGE };
 
 fn main() {
@@ -57,7 +55,7 @@ fn main() {
 	});
 
 	let index = argv[index_arg].parse::<usize>().unwrap_or_else(|e| {
-		eprintln!("{}: {}: {}", argv[0], argv[1], e);
+		eprintln!("{}: {}: {}.", argv[0], argv[1], e);
 		exit(EX_DATAERR);
 	});
 
@@ -77,13 +75,13 @@ fn main() {
 		.stdout(Stdio::piped())
 		.spawn()
 		.unwrap_or_else( |e| {
-			eprintln!("{}: {}: {}", argv[0], argv[command_arg], e.strerror());
+			eprintln!("{}: {}: {}.", argv[0], argv[command_arg], e);
 			exit(EX_UNAVAILABLE);
 		});
 
 	let field = fields.get(index).unwrap_or_else(|| {
 		eprintln!(
-			"{}: {}: No such index in input",
+			"{}: {}: No such index in input.",
 			argv[0],
 			index.to_string(),
 		);
@@ -96,7 +94,7 @@ fn main() {
 	}
 
 	let output = spawned.wait_with_output().unwrap_or_else(|e| {
-		eprintln!("{}: {}: {}", argv[0], argv[command_arg], e.strerror());
+		eprintln!("{}: {}: {}.", argv[0], argv[command_arg], e);
 		exit(EX_IOERR);
 	});
 
@@ -105,7 +103,7 @@ fn main() {
 	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);
+		eprintln!("{}: {}: {}.", argv[0], argv[command_arg], e);
 		exit(EX_IOERR);
 	});
 
@@ -113,8 +111,8 @@ fn main() {
 
 	stdout().write_all(
 		fields.join(&d.to_string()).as_bytes()
-	).unwrap_or_else(|e| {
+	).unwrap_or_else(|e|{
-		eprintln!("{}: {}", argv[0], e.strerror());
+		eprintln!("{}: {}.", argv[0], e);
 		exit(EX_IOERR);
 	});
 }

src/hru.rs

@@ -23,10 +23,8 @@ use std::{
 	process::{ ExitCode, exit },
 };
 
-extern crate strerror;
 extern crate sysexits;
 
-use strerror::StrError;
 use sysexits::{ EX_DATAERR, EX_IOERR, EX_SOFTWARE };
 
 const LIST: [(u32, &str); 10] = [
@@ -51,7 +49,7 @@ fn convert(input: u128) -> Result<(f64, (u32, &'static str)), String> {
 		let c = match 10_u128.checked_pow(n) {
 			Some(c) => c,
 			None => {
-				return Err(format!("10^{}: Integer overflow", n.to_string()));
+				return Err(format!("10^{}: Integer overflow.", n.to_string()));
 			},
 		};
 
@@ -81,7 +79,7 @@ fn main() -> ExitCode {
 				f
 			},
 			Err(err) => {
-				eprintln!("{}: {}", argv[0], err);
+				eprintln!("{}: {}.", argv[0], err);
 				return ExitCode::from(EX_DATAERR as u8);
 			},
 		};
@@ -89,7 +87,7 @@ fn main() -> ExitCode {
 		let (number, prefix) = match convert(n) {
 			Ok(x) => x,
 			Err(err) => {
-				eprintln!("{}: {}", argv[0], err);
+				eprintln!("{}: {}.", argv[0], err);
 				return ExitCode::from(EX_SOFTWARE as u8);
 			},
 		};
@@ -100,7 +98,7 @@ fn main() -> ExitCode {
 
 		stdout().write_all(format!("{} {}\n", out, si_prefix).as_bytes())
 			.unwrap_or_else(|e| {
-				eprintln!("{}: {}", argv[0], e.strerror());
+				eprintln!("{}: {}.", argv[0], e);
 				exit(EX_IOERR);
 			});
 	}

src/rpn.rs

@@ -172,7 +172,7 @@ fn eval(
 					};
 				} else {
 					return Err(EvaluationError {
-						message: format!("{}: Unexpected operation", op),
+						message: format!("{}: Unexpected operation.", op),
 						code: EX_DATAERR,
 					})
 				}