Set the current directory correctly when there's no root

emkey1 · Nov 15, 2017 · 6e85bf4 · 6e85bf4
1 parent bdb81f2
commit 6e85bf4
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 10 deletions.
diff --git a/app/AppDelegate.m b/app/AppDelegate.m
@@ -42,7 +42,7 @@ - (int)startThings {
     char *program = "/bin/login";
     char *argv[] = {program, NULL};
     char *envp[] = {NULL};
-    err = create_init_process(program, argv, envp);
+    err = sys_execve(program, argv, envp);
     if (err < 0)
         return err;
     err = create_stdio(ios_tty_driver);

diff --git a/kernel/init.c b/kernel/init.c
@@ -20,10 +20,7 @@ int mount_root(const struct fs_ops *fs, const char *source) {
 
 static void nop_handler() {}
 
-// this function parses command line arguments and initializes global
-// data structures. thanks programming discussions discord server for the name.
-// https://discord.gg/9zT7NHP
-int create_init_process(const char *program, char *const argv[], char *const envp[]) {
+void create_first_process() {
     signal(SIGUSR1, nop_handler);
 
     current = process_create();
@@ -36,8 +33,6 @@ int create_init_process(const char *program, char *const argv[], char *const env
     current->umask = 0022;
     current->thread = pthread_self();
     sys_setsid();
-
-    return sys_execve(program, argv, envp);
 }
 
 int create_stdio(struct tty_driver driver) {

diff --git a/kernel/init.h b/kernel/init.h
@@ -4,7 +4,7 @@
 #include "fs/tty.h"
 
 int mount_root(const struct fs_ops *fs, const char *source);
-int create_init_process(const char *program, char *const argv[], char *const envp[]);
+void create_first_process();
 int create_stdio(struct tty_driver driver);
 
 #endif
diff --git a/xX_main_Xx.h b/xX_main_Xx.h
@@ -28,10 +28,24 @@ static inline int xX_main_Xx(int argc, char *const argv[]) {
         perror(root);
         exit(1);
     }
-    mount_root(&fakefs, root_realpath);
+    const struct fs_ops *fs;
+    if (strcmp(strrchr(root_realpath, '/') + 1, "data") == 0)
+        fs = &fakefs;
+    else
+        fs = &realfs;
+    mount_root(fs, root_realpath);
+
+    create_first_process();
+    if (!has_root) {
+        char cwd[MAX_PATH + 1];
+        getcwd(cwd, sizeof(cwd));
+        struct fd *pwd = generic_open(cwd, O_RDONLY_, 0);
+        fd_close(current->pwd);
+        current->pwd = pwd;
+    }
 
     char *envp[] = {NULL};
-    int err = create_init_process(argv[optind], argv + optind, envp);
+    int err = sys_execve(argv[optind], argv + optind, envp);
     if (err < 0)
         return err;
     err = create_stdio(real_tty_driver);