Merge branch 'retval' into overgrown

Makefile

@@ -32,7 +32,7 @@ RUSTLIBS = --extern getopt=build/o/libgetopt.rlib \
 CFLAGS += -I$(SYSEXITS)
 
 .PHONY: all
-all: argued dj false fop hru intcmp mm npc rpn scrut str strcmp swab true
+all: dj false fop hru intcmp mm npc pschdir retval rpn scrut str strcmp swab true
 
 # keep build/include until bindgen(1) has stdin support
 # https://github.com/rust-lang/rust-bindgen/issues/2703
@@ -87,11 +87,6 @@ build/o/libsysexits.rlib: build/include/sysexits.h
 build/include/sysexits.h: build $(SYSEXITS)sysexits.h
 	printf '\043define EXIT_FAILURE 1\n' | cat - $(SYSEXITS)sysexits.h > $@
 
-.PHONY: argued
-argued: build/bin/argued
-build/bin/argued: src/argued.rs build
-	$(RUSTC) $(RUSTFLAGS) -o $@ src/argued.rs
-
 .PHONY: dj
 dj: build/bin/dj
 build/bin/dj: src/dj.c build
@@ -127,6 +122,16 @@ npc: build/bin/npc
 build/bin/npc: src/npc.c build
 	$(CC) $(CFLAGAS) -o $@ src/npc.c
 
+.PHONY: pschdir
+pschdir: build/bin/pschdir
+build/bin/pschdir: src/pschdir.c build
+	$(CC) $(CFLAGS) -o $@ src/pschdir.c
+
+.PHONY: retval
+retval: build/bin/retval
+build/bin/retval: src/retval.rs build rustlibs
+	$(RUSTC) $(RUSTFLAGS) $(RUSTLIBS) -o $@ src/retval.rs
+
 .PHONY: rpn
 rpn: build/bin/rpn
 build/bin/rpn: src/rpn.rs build rustlibs

docs/argued.1

@@ -1,28 +0,0 @@
-.\" Copyright (c) 2022–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 ARGUED 1 2024-07-23 "Harakit-overgrown X.X.X"
-.SH NAME
-argued \(en check for arguments
-.\"
-.SH DESCRIPTION
-
-.BR argued (1)
-exits successfully if any arguments are provided, and unsuccessfully
-otherwise.
-.\"
-.SH AUTHOR
-
-Written by DTB
-.MT trinity@trinity.moe
-.ME .
-.\"
-.SH COPYRIGHT
-
-This work is marked with CC0 1.0. To see a copy of this license, visit
-<http://creativecommons.org/publicdomain/zero/1.0>.
-.\"
-.SH SEE ALSO
-.BR test (1)

src/pschdir.c

@@ -0,0 +1,30 @@
+#include <errno.h> /* EACCESS, ELOOP, ENAMETOOLONG, ENOENT, ENOTDIR, errno */
+#include <stdio.h> /* fprintf(3), stderr */
+#include <string.h> /* strerror(3) */
+#include <sysexits.h> /* EX_OSERR, EX_NOPERM, EX_NOINPUT, EX_UNAVAILABLE,
+                       * EX_USAGE */
+#include <unistd.h> /* chdir(2) */
+
+char *program_name = "pschdir";
+
+int main(int argc, char *argv[]){
+	if (argc < 3) {
+		fprintf(stderr, "Usage: %s [directory] [command (argument...)]\n",
+			argv[0] == NULL ? program_name : argv[0]);
+		return EX_USAGE;
+	}
+
+	if(chdir(argv[1]) != 0){
+		fprintf(stderr, "%s: %s: %s\n", argv[0], argv[1], strerror(errno));
+
+		switch (errno) {
+			case ENAMETOOLONG:	return EX_OSERR;
+			case EACCES:      	return EX_NOPERM;
+			case ENOENT:
+			case ENOTDIR:     	return EX_NOINPUT;
+			default:          	return EX_UNAVAILABLE;
+		}
+	}
+
+	execvp(argv[2], &argv[2]);
+}

src/retval.rs

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022_2024 DTB <trinity@trinity.moe>
+ * 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
@@ -16,13 +16,24 @@
  * along with this program. If not, see https://www.gnu.org/licenses/.
  */
 
- use std::{ env::args, process::ExitCode };
+use std::{ env::args, process::ExitCode };
 
- fn main() -> ExitCode {
+extern crate sysexits;
+use sysexits::EX_USAGE;
+
+fn usage(s: &str) -> ExitCode {
+	eprintln!("Usage: {} status", s);
+	ExitCode::from(EX_USAGE)
+}
+
+fn main() -> ExitCode {
 	let argv = args().collect::<Vec<String>>();
 
 	match argv.len() {
- 		0 | 1 => ExitCode::FAILURE,
+		2 => match argv[1].parse::<u8>() {
- 		_ =>     ExitCode::SUCCESS
+				Ok(e) => ExitCode::from(e),
- 	}
+				_ => usage(&argv[0])
+			},
+		_ => usage(&argv[0])
 	}
+}