diff options
| author | salmonik <salmonik@tuta.io> | 2026-11-01 15:52:39 +0100 |
|---|---|---|
| committer | salmonik <salmonik@tuta.io> | 2026-11-01 15:52:39 +0100 |
| commit | ef2d8e354a91ef30e34e2ddb61381131a989591c (patch) | |
| tree | 6a5e46da58f3371e430354d5352b6675d6076c39 /bins/ls/src/main.rs | |
| parent | build: default profile is release (debug too slow for dev loop) (diff) | |
| download | rs-dos-ef2d8e354a91ef30e34e2ddb61381131a989591c.tar.gz rs-dos-ef2d8e354a91ef30e34e2ddb61381131a989591c.zip | |
bins: read user args from argv[1..]; fix date year digit
exec::spawn passes C-style argv with argv[0] = the command name, but
ls, cat, mkdir, touch and rm treated argv[0] as their first user
argument. Every path they were given resolved to the literal command
name ("ls", "mkdir", ...), so they failed silently: `mkdir .../sub`
never created the directory, `cat` printed nothing.
date formatted its last year digit as `y as u8 % 10`, which truncates
before the modulo (2026 -> 234 -> '4'), printing "2024".
Only visible now that the system image actually stages /bin — before,
/bin was empty and every command fell back to a built-in.
Diffstat (limited to '')
| -rw-r--r-- | bins/ls/src/main.rs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/bins/ls/src/main.rs b/bins/ls/src/main.rs index 956bf18..b4acc41 100644 --- a/bins/ls/src/main.rs +++ b/bins/ls/src/main.rs | |||
| @@ -16,8 +16,9 @@ fn put(exports: &rsapi::Exports, buf: &[u8]) { | |||
| 16 | 16 | ||
| 17 | #[unsafe(no_mangle)] | 17 | #[unsafe(no_mangle)] |
| 18 | pub extern "C" fn efi_main(exports: &'static rsapi::Exports, argc: usize, argv: *const rsapi::Arg) -> i32 { | 18 | pub extern "C" fn efi_main(exports: &'static rsapi::Exports, argc: usize, argv: *const rsapi::Arg) -> i32 { |
| 19 | let path_str = if argc > 0 { | 19 | // C-style argv: argv[0] is the program name, user args start at 1. |
| 20 | let a = unsafe { &*argv }; | 20 | let path_str = if argc > 1 { |
| 21 | let a = unsafe { &*argv.add(1) }; | ||
| 21 | unsafe { core::str::from_utf8_unchecked(core::slice::from_raw_parts(a.ptr, a.len)) } | 22 | unsafe { core::str::from_utf8_unchecked(core::slice::from_raw_parts(a.ptr, a.len)) } |
| 22 | } else { | 23 | } else { |
| 23 | "/" | 24 | "/" |
