Forward argv along with spawnl/spawnv syscall

Author: scopeInfinity

Makefile

@@ -102,7 +102,7 @@ binaries: $(bt_stage1) $(bt_stage2) $(kernel_core) $(rm_static)
 SECTOR_COUNT_BT_STAGE1 = 1
 SECTOR_COUNT_SHARED_LIBRARY = 1
 SECTOR_COUNT_BT_STAGE2 = 11
-SECTOR_COUNT_KERNEL = 44
+SECTOR_COUNT_KERNEL = 45
 
 SECTOR_START_BT_STAGE1 = 0
 SECTOR_START_SHARED_LIBRARY = $(shell expr $(SECTOR_START_BT_STAGE1) + $(SECTOR_COUNT_BT_STAGE1) )

src/kernel/core.c

@@ -6,6 +6,7 @@
 
 #include <string.h>
 #include <process.h>
+#include <stddef.h>
 #include <sys/syscall.h>
 #include <conio.h>
 
@@ -48,7 +49,7 @@ void kernel_core_entry() {
 
     clrscr();
 
-    int init_pid = spawn(INIT_APPNAME);
+    int init_pid = spawnl(INIT_APPNAME, INIT_APPNAME, NULL);
     print_log("init process created: %d", init_pid);
 
     // interrupt_pit_enable();

src/kernel/process/process.c

@@ -46,10 +46,22 @@ int syscall_1_process_exec_lba_sc(int lba_start, int sector_count) {
     return process_exec(lba_start, sector_count);
 }
 
-int syscall_1_process_spawn_fname(int user_ds, char *_us_filename) {
+int syscall_1_process_spawn_fname(int user_ds, char *_us_filename, char *_us_argv[]) {
     char filename[FS_FFS_FILENAME_LIMIT];
+    char argv_with_uspointer[PROCESS_MAX_ARGC];
+    char *argv_with_kspointer[PROCESS_MAX_ARGC];
+    char argv[PROCESS_MAX_ARGC][PROCESS_MAX_ARG_LEN];  // data store
     syscall_strncpy_user_to_kernel(user_ds, _us_filename, filename, sizeof(filename));
-
+    syscall_strncpy_user_to_kernel(user_ds, _us_argv, argv_with_uspointer, sizeof(argv_with_uspointer));
+    // if src string is NULL, then dst should be null.
+    for (int i = 0; i < PROCESS_MAX_ARGC; i++) {
+        if(argv_with_uspointer[i]==NULL) {
+            argv_with_kspointer[i]=NULL;
+            break;
+        }
+        syscall_strncpy_user_to_kernel(user_ds, argv[i], argv_with_uspointer[i], sizeof(argv[i]));
+        argv_with_kspointer[i] = argv[i];
+    }
 
     union FFSFileEntry entry;
     int file_id = file_handler_find(filename, &entry);
@@ -58,6 +70,8 @@ int syscall_1_process_spawn_fname(int user_ds, char *_us_filename) {
 
     int lba_start = resolve_abs_lba(FFS_UNIQUE_PARITION_ID, entry.content.start_block_id);
     int sector_count = (entry.content.filesize + FS_BLOCK_SIZE -1)/FS_BLOCK_SIZE;
+
+    // TODO: process created should have argv pushed on top of stack.
     return syscall_1_process_spawn_lba_sc(lba_start, sector_count);
 }
 
@@ -71,7 +85,7 @@ int syscall_1_process(int operation, int a0, int a1, int a2, int a3, int user_ds
         case SYSCALL_PROCESS_SUB_EXEC_LBA_SC:
             return syscall_1_process_exec_lba_sc(a0, a1);
         case SYSCALL_PROCESS_SUB_SPAWN_FNAME:
-            return syscall_1_process_spawn_fname(user_ds, (char*)a0);
+            return syscall_1_process_spawn_fname(user_ds, (char*)a0, (char**)a1);
     }
     return -1;
 }

src/usr/include/process.h

@@ -5,9 +5,13 @@
 #define SYSCALL_PROCESS_SUB_EXEC_LBA_SC  2
 #define SYSCALL_PROCESS_SUB_SPAWN_FNAME  3
 
+#define PROCESS_MAX_ARGC     32
+#define PROCESS_MAX_ARG_LEN  64
+
 // if non-negative value is returned
 //   then it's the pid of the new process
 //   otherwise it's some error code
-int spawn(char *path);
+int spawnl(char *path, char *arg0, ...);
+int spawnv(char *path, char *argv[]);
 
 void yield();

src/usr/lib/process.c

@@ -1,8 +1,32 @@
 #include <process.h>
+#include <stddef.h>
+#include <stdarg.h>
 #include <sys/syscall.h>
 
-int spawn(char *file_path) {
-    int pid = SYSCALL_A2(SYSCALL_PROCESS, SYSCALL_PROCESS_SUB_SPAWN_FNAME, file_path);
+int spawnl(char *file_path, char *arg0, ...) {
+    va_list args;
+    va_start(args, arg0);
+    char *argv[PROCESS_MAX_ARGC];
+
+    // prepare argv
+    {
+        int i = 0;
+        while(i<PROCESS_MAX_ARGC-1) {
+            char *arg = va_arg(args, char *);
+            if(arg==NULL) break;
+            argv[i] = arg;
+            i++;
+        }
+        argv[i] = NULL;
+    }
+
+    int rv = spawnv(file_path, argv);
+    va_end(args);
+    return rv;
+}
+
+int spawnv(char *file_path, char *argv[]) {
+    int pid = SYSCALL_A3(SYSCALL_PROCESS, SYSCALL_PROCESS_SUB_SPAWN_FNAME, file_path, argv);
     if(pid>=0) yield();
     return pid;
 }

src/usr/local/src/sh.c

@@ -28,7 +28,7 @@ int cmd_run(char *fname) {
         printf("usage: run <filename>\n");
         return -2;
     }
-    return spawn(fname);
+    return spawnl(fname, fname, NULL);
 }
 
 int cmd_echo(char *text) {