From ef2d8e354a91ef30e34e2ddb61381131a989591c Mon Sep 17 00:00:00 2001
From: salmonik <salmonik@tuta.io>
Date: Sun, 1 Nov 2026 15:52:39 +0100
Subject: bins: read user args from argv[1..]; fix date year digit
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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.
---
 bins/cat/src/main.rs   | 5 +++--
 bins/date/src/main.rs  | 2 +-
 bins/ls/src/main.rs    | 5 +++--
 bins/mkdir/src/main.rs | 3 ++-
 bins/rm/src/main.rs    | 3 ++-
 bins/touch/src/main.rs | 3 ++-
 6 files changed, 13 insertions(+), 8 deletions(-)

(limited to 'bins')

diff --git a/bins/cat/src/main.rs b/bins/cat/src/main.rs
index 6683c83..f530525 100644
--- a/bins/cat/src/main.rs
+++ b/bins/cat/src/main.rs
@@ -37,8 +37,9 @@ fn dump_file(exports: &rsapi::Exports, path: &str) -> i32 {
 
 #[unsafe(no_mangle)]
 pub extern "C" fn efi_main(exports: &'static rsapi::Exports, argc: usize, argv: *const rsapi::Arg) -> i32 {
-    let args = unsafe { core::slice::from_raw_parts(argv, argc) };
-    if argc > 0 {
+    // C-style argv: argv[0] is the program name, user args start at 1.
+    let args = unsafe { core::slice::from_raw_parts(argv.add(1), argc.saturating_sub(1)) };
+    if !args.is_empty() {
         // Print each path argument
         let mut code = 0;
         for a in args.iter() {
diff --git a/bins/date/src/main.rs b/bins/date/src/main.rs
index 880833e..68e70d3 100644
--- a/bins/date/src/main.rs
+++ b/bins/date/src/main.rs
@@ -22,7 +22,7 @@ pub extern "C" fn efi_main(exports: &'static rsapi::Exports, _argc: usize, _argv
     let mut buf = [0u8; 19];
     let y = t.year;
     buf[0] = b'0' + (y / 1000) as u8; buf[1] = b'0' + (y / 100) as u8 % 10;
-    buf[2] = b'0' + (y / 10) as u8 % 10; buf[3] = b'0' + y as u8 % 10;
+    buf[2] = b'0' + (y / 10) as u8 % 10; buf[3] = b'0' + (y % 10) as u8;
     buf[4] = b'-';
     let m = dig(t.month); buf[5] = m[0]; buf[6] = m[1];
     buf[7] = b'-';
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]) {
 
 #[unsafe(no_mangle)]
 pub extern "C" fn efi_main(exports: &'static rsapi::Exports, argc: usize, argv: *const rsapi::Arg) -> i32 {
-    let path_str = if argc > 0 {
-        let a = unsafe { &*argv };
+    // C-style argv: argv[0] is the program name, user args start at 1.
+    let path_str = if argc > 1 {
+        let a = unsafe { &*argv.add(1) };
         unsafe { core::str::from_utf8_unchecked(core::slice::from_raw_parts(a.ptr, a.len)) }
     } else {
         "/"
diff --git a/bins/mkdir/src/main.rs b/bins/mkdir/src/main.rs
index f6f7e66..82302df 100644
--- a/bins/mkdir/src/main.rs
+++ b/bins/mkdir/src/main.rs
@@ -10,7 +10,8 @@ fn panic(_info: &core::panic::PanicInfo) -> ! {
 
 #[unsafe(no_mangle)]
 pub extern "C" fn efi_main(exports: &'static rsapi::Exports, argc: usize, argv: *const rsapi::Arg) -> i32 {
-    let args = unsafe { core::slice::from_raw_parts(argv, argc) };
+    // C-style argv: argv[0] is the program name, user args start at 1.
+    let args = unsafe { core::slice::from_raw_parts(argv.add(1), argc.saturating_sub(1)) };
     if args.is_empty() { return 1; }
     let path = unsafe { core::str::from_utf8_unchecked(core::slice::from_raw_parts(args[0].ptr, args[0].len)) };
     let rc = (exports.fs_create)(rsapi::Line { ptr: path.as_ptr(), len: path.len() }, true);
diff --git a/bins/rm/src/main.rs b/bins/rm/src/main.rs
index 3407563..c688ac3 100644
--- a/bins/rm/src/main.rs
+++ b/bins/rm/src/main.rs
@@ -10,7 +10,8 @@ fn panic(_info: &core::panic::PanicInfo) -> ! {
 
 #[unsafe(no_mangle)]
 pub extern "C" fn efi_main(exports: &'static rsapi::Exports, argc: usize, argv: *const rsapi::Arg) -> i32 {
-    let args = unsafe { core::slice::from_raw_parts(argv, argc) };
+    // C-style argv: argv[0] is the program name, user args start at 1.
+    let args = unsafe { core::slice::from_raw_parts(argv.add(1), argc.saturating_sub(1)) };
     if args.is_empty() { return 1; }
     let path = unsafe { core::str::from_utf8_unchecked(core::slice::from_raw_parts(args[0].ptr, args[0].len)) };
     (exports.fs_remove)(rsapi::Line { ptr: path.as_ptr(), len: path.len() })
diff --git a/bins/touch/src/main.rs b/bins/touch/src/main.rs
index 5cd61e3..59aa7fa 100644
--- a/bins/touch/src/main.rs
+++ b/bins/touch/src/main.rs
@@ -10,7 +10,8 @@ fn panic(_info: &core::panic::PanicInfo) -> ! {
 
 #[unsafe(no_mangle)]
 pub extern "C" fn efi_main(exports: &'static rsapi::Exports, argc: usize, argv: *const rsapi::Arg) -> i32 {
-    let args = unsafe { core::slice::from_raw_parts(argv, argc) };
+    // C-style argv: argv[0] is the program name, user args start at 1.
+    let args = unsafe { core::slice::from_raw_parts(argv.add(1), argc.saturating_sub(1)) };
     if args.is_empty() { return 1; }
     let path = unsafe { core::str::from_utf8_unchecked(core::slice::from_raw_parts(args[0].ptr, args[0].len)) };
     (exports.fs_create)(rsapi::Line { ptr: path.as_ptr(), len: path.len() }, false)
-- 
cgit v1.2.3