2 Commits

Author SHA1 Message Date
DTB
fa5e320b41 argued(1): re-write in Rust 2024-07-23 20:14:08 -06:00
DTB
3288dc5aa9 argued(1): import from trinity/src 2024-07-23 19:53:15 -06:00
4 changed files with 62 additions and 67 deletions

View File

@@ -32,7 +32,7 @@ RUSTLIBS = --extern getopt=build/o/libgetopt.rlib \
CFLAGS += -I$(SYSEXITS)
.PHONY: all
all: dj false fop hru intcmp mm npc pschdir rpn scrut str strcmp swab true
all: argued dj false fop hru intcmp mm npc 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,6 +87,11 @@ 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
@@ -122,11 +127,6 @@ 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.rs build
$(RUSTC) $(RUSTFLAGS) $(RUSTLIBS) -o $@ src/pschdir.rs
.PHONY: rpn
rpn: build/bin/rpn
build/bin/rpn: src/rpn.rs build rustlibs

28
docs/argued.1 Normal file
View File

@@ -0,0 +1,28 @@
.\" Copyright (c) 20222024 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)

28
src/argued.rs Normal file
View File

@@ -0,0 +1,28 @@
/*
* Copyright (c) 2022_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, process::ExitCode };
fn main() -> ExitCode {
let argv = args().collect::<Vec<String>>();
match argv.len() {
0 | 1 => ExitCode::FAILURE,
_ => ExitCode::SUCCESS
}
}

View File

@@ -1,61 +0,0 @@
/*
* Copyright (c) 2023_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::Error, process::{ Command, ExitCode } };
extern crate strerror;
use strerror::StrError;
extern crate sysexits;
use sysexits::{ EX_UNAVAILABLE, EX_USAGE };
fn error(p: &str, n: &str, e: Error) -> ExitCode {
eprintln!("{}: {}: {}", p, n, e.strerror());
ExitCode::from(EX_UNAVAILABLE as u8)
}
fn main() -> ExitCode {
let argv = args().collect::<Vec<String>>();
if argv.len() < 3 {
eprintln!("Usage: {} directory command [argument]", argv[0]);
return ExitCode::from(EX_USAGE as u8);
}
let cmdargs = argv.iter().clone().skip(3).collect::<Vec<&String>>();
match Command::new(argv[2].clone())
.current_dir(argv[1].clone())
.args(cmdargs)
.spawn() {
Ok(mut child) => match child.wait() {
Ok(status) => {
match status.code() {
Some(code) => ExitCode::from(code as u8),
None => {
eprintln!("{}: {}: process terminated by signal",
argv[0], argv[2]);
ExitCode::FAILURE
}
}
},
Err(e) => error(&argv[0], &argv[2], e)
},
Err(e) => error(&argv[0], &argv[2], e)
}
}