diff options
| author | salmonik <salmonik@tuta.io> | 2026-08-27 17:16:04 +0200 |
|---|---|---|
| committer | salmonik <salmonik@tuta.io> | 2026-08-27 17:16:04 +0200 |
| commit | 8767dbecb45bbe5f748952fb9171b1a96c173f67 (patch) | |
| tree | c10a66c91a53522feb980d8b59aa8c87293537f8 /bins/cat/src/main.rs | |
| parent | streams: per-invocation channel, pumping mode, filter pipeline wiring (diff) | |
| download | rs-dos-8767dbecb45bbe5f748952fb9171b1a96c173f67.tar.gz rs-dos-8767dbecb45bbe5f748952fb9171b1a96c173f67.zip | |
tool migration: v2 exports + 10 external CLI binaries
rsapi v2: 14 new ABI function pointers appended after v1 — fs_resolve,
fs_dir_next (iterator), fs_create, fs_remove, fs_read, fs_write,
fs_size, fs_close, rtc_now, mem_stats, pci_probe, pci_device,
klog_dump, kernel_version. New C-repr structs: DirEntry, RtcTime,
MemStats, PciDevice, KernelVersion. ABI_VERSION bumped to 2.
Shell-side: build_exports() constructs the full table at runtime per
invocation (replaces static const). 14 kernel-side wrapper functions
bridge rsapi types to rsnix kernel APIs; fs_dir_next maintains a
per-handle cache of children() results for iteration.
Tool binaries (10 crates, all linked against rsapi only):
- date: rtc_now → formatted YYYY-MM-DD HH:MM:SS
- mem: heap/pages free/total via mem_stats
- pci: pci_probe + pci_device enumerate all devices
- cat: fs_read paths or get_line stdin; put_line output
- ls: fs_resolve + fs_dir_next iteration; trailing / for dirs
- mkdir: fs_create(path, true)
- touch: fs_create(path, false)
- rm: fs_remove(path)
- klog: klog_dump 2048 bytes → put_line
- info: rtc_now + kernel_version (minimal; mem/pci deferred)
Gate verified: date prints RTC; pci lists all 4 QEMU devices
(8086:29c0, 1234:1111, 8086:10d3, 8086:2918); hello/boom/count
still work; test-disk PASS; poweroff clean.
Diffstat (limited to '')
| -rw-r--r-- | bins/cat/src/main.rs | 68 |
1 files changed, 68 insertions, 0 deletions
diff --git a/bins/cat/src/main.rs b/bins/cat/src/main.rs new file mode 100644 index 0000000..6683c83 --- /dev/null +++ b/bins/cat/src/main.rs | |||
| @@ -0,0 +1,68 @@ | |||
| 1 | //! cat — print files or stdin via the exports table. | ||
| 2 | //! | ||
| 3 | //! Args: [path ...] — each path is printed as raw text. | ||
| 4 | //! No args = read from get_line (stdin) until EOF. | ||
| 5 | |||
| 6 | #![no_std] | ||
| 7 | #![no_main] | ||
| 8 | |||
| 9 | #[panic_handler] | ||
| 10 | fn panic(_info: &core::panic::PanicInfo) -> ! { | ||
| 11 | loop { core::hint::spin_loop(); } | ||
| 12 | } | ||
| 13 | |||
| 14 | fn put(exports: &rsapi::Exports, buf: &[u8]) { | ||
| 15 | (exports.put_line)(rsapi::Line { ptr: buf.as_ptr(), len: buf.len() }); | ||
| 16 | } | ||
| 17 | |||
| 18 | /// Read one file and put_line each chunk. | ||
| 19 | fn dump_file(exports: &rsapi::Exports, path: &str) -> i32 { | ||
| 20 | let h = (exports.fs_resolve)(rsapi::Line { ptr: path.as_ptr(), len: path.len() }); | ||
| 21 | if h < 0 { | ||
| 22 | return -1; | ||
| 23 | } | ||
| 24 | let mut buf = [0u8; 512]; | ||
| 25 | let mut pos: u64 = 0; | ||
| 26 | loop { | ||
| 27 | let n = (exports.fs_read)(h, buf.as_mut_ptr(), pos, 512); | ||
| 28 | if n <= 0 { break; } | ||
| 29 | if !(exports.put_line)(rsapi::Line { ptr: buf.as_ptr(), len: n as usize }) { | ||
| 30 | break; // pipeline says stop | ||
| 31 | } | ||
| 32 | pos += n as u64; | ||
| 33 | } | ||
| 34 | (exports.fs_close)(h); | ||
| 35 | 0 | ||
| 36 | } | ||
| 37 | |||
| 38 | #[unsafe(no_mangle)] | ||
| 39 | pub extern "C" fn efi_main(exports: &'static rsapi::Exports, argc: usize, argv: *const rsapi::Arg) -> i32 { | ||
| 40 | let args = unsafe { core::slice::from_raw_parts(argv, argc) }; | ||
| 41 | if argc > 0 { | ||
| 42 | // Print each path argument | ||
| 43 | let mut code = 0; | ||
| 44 | for a in args.iter() { | ||
| 45 | let path = core::str::from_utf8(unsafe { | ||
| 46 | core::slice::from_raw_parts(a.ptr, a.len) | ||
| 47 | }).unwrap_or(""); | ||
| 48 | if dump_file(exports, path) != 0 { | ||
| 49 | code = 1; | ||
| 50 | } | ||
| 51 | } | ||
| 52 | code | ||
| 53 | } else { | ||
| 54 | // No args: read from stdin (get_line) until EOF/Abort | ||
| 55 | loop { | ||
| 56 | let mut line = rsapi::Line { ptr: core::ptr::null(), len: 0 }; | ||
| 57 | match (exports.get_line)(&mut line) { | ||
| 58 | rsapi::StreamResult::Line => { | ||
| 59 | put(exports, unsafe { | ||
| 60 | core::slice::from_raw_parts(line.ptr, line.len) | ||
| 61 | }); | ||
| 62 | } | ||
| 63 | rsapi::StreamResult::Eof | rsapi::StreamResult::Abort => break, | ||
| 64 | } | ||
| 65 | } | ||
| 66 | 0 | ||
| 67 | } | ||
| 68 | } | ||
