Added (non-working) filling of envp for executables.

Author: pradosh-arduino

source/includes/strings.h

@@ -16,6 +16,9 @@
 #define MAX_WORDS 30
 #define MAX_WORD_LEN 40
 
+#define CONCAT(...) \
+    str_concat_impl(sizeof((const char*[]){__VA_ARGS__}) / sizeof(const char*), __VA_ARGS__)
+
 // typedef char symbol[];
 
 /**

source/kernel/C/shell/commands/exec.c

@@ -16,6 +16,8 @@
 #include <tty.h>
 #include <keyboard.h>
 
+extern char* global_envp[];
+
 int cmd_exec(int argc, char** argv)
 {
     if (argc < 2) {
@@ -42,7 +44,7 @@ int cmd_exec(int argc, char** argv)
     tty_flush_input();
     keyboard_flush_buffer();
 
-    if (userland_exec(path, user_argc, user_argv, NULL) != 0) {
+    if (userland_exec(path, user_argc, user_argv, global_envp) != 0) {
         keyboard_flush_buffer();
         eprintf("exec: failed to load ELF");
         return -1;

source/kernel/C/shell/sh.c

@@ -10,11 +10,22 @@
  */
 
 #include <commands/login.h>
+#include <filesystems/vfs.h>
 #include <sh_util.h>
 #include <multitasking.h>
+#include <strings.h>
 
 int last_status_code = 0;
 
+char* global_envp[] = {
+    "HOME=/",
+    "PATH=/",
+    "TERM=linux",
+    "USER=none",
+    "SHLVL=1",
+    NULL
+};
+
 void init_command_list(command_list* lst)
 {
     if (lst == NULL)
@@ -160,6 +171,8 @@ void ksh_exec(){
                 &sudo_flag
             };
 
+            strcpy(global_envp[3], CONCAT("USER=", username));
+
             shell_main(argc, dummy_argv);
         }
         else{
@@ -212,6 +225,7 @@ int shell_main(int argc, char** argv){
             memset(command, 0, commandBufferSize);
 
             if(running){
+                strcpy(global_envp[1], CONCAT("PATH", vfs_getcwd()));
                 show_prompt(argc, argv);
             }
             continue;

source/kernel/C/stream.c

@@ -77,7 +77,7 @@ static void fd_object_release(fd_object_t* object)
     if (object->ref_count > 0)
         return;
 
-    if (object->owns_file && object->file)
+    if (object->owns_file && object->file && object->file->mnt)
         vfs_close(object->file);
 
     memset(object, 0, sizeof(*object));

source/kernel/C/strings.c

@@ -9,6 +9,7 @@
  * 
  */
 #include <strings.h>
+#include <stdarg.h>
 
 const char hex_digits[] = "0123456789abcdef";
 const char caps_hex_digits[] = "0123456789ABCDEF";
@@ -605,3 +606,33 @@ char* strtok(char* str, const char* delim) {
     static char* saveptr;
     return strtok_r(str, delim, &saveptr);
 }
+
+char* str_concat_impl(int count, ...)
+{
+    va_list args;
+    size_t total_len = 0;
+
+    // First pass: calculate total length
+    va_start(args, count);
+    for (int i = 0; i < count; i++) {
+        const char* s = va_arg(args, const char*);
+        if (s) total_len += strlen(s);
+    }
+    va_end(args);
+
+    // Allocate result
+    char* result = (char*)kmalloc(total_len + 1);
+    if (!result) return NULL;
+
+    result[0] = '\0';
+
+    // Second pass: concatenate
+    va_start(args, count);
+    for (int i = 0; i < count; i++) {
+        const char* s = va_arg(args, const char*);
+        if (s) strcat(result, s);
+    }
+    va_end(args);
+
+    return result;
+}

source/kernel/C/userland.c

@@ -127,11 +127,11 @@ static int string_array_count(const char* const* arr) {
     return count;
 }
 
-static const char* const default_envp[] = {
+static char* default_envp[] = {
     "HOME=/",
     "PATH=/",
     "TERM=linux",
-    "USER=root",
+    "USER=none",
     "SHLVL=1",
     NULL
 };