X-Git-Url: https://scm.lunaixsky.com/lunaix-os.git/blobdiff_plain/bef1210245bb3180a57f26405369654eaa477f63..28c176b668c841a3b7fb093faccf0efa39257603:/lunaix-os/usr/init/init.c?ds=sidebyside

diff --git a/lunaix-os/usr/init/init.c b/lunaix-os/usr/init/init.c
index 0a2f541..2416e07 100644
--- a/lunaix-os/usr/init/init.c
+++ b/lunaix-os/usr/init/init.c
@@ -15,14 +15,15 @@
         }                                                                      \
     } while (0)
 
-#define check(statement)                                      \
-    do {                                                                       \
+#define check(statement)                                                       \
+    ({                                                                         \
         int err = 0;                                                           \
-        if ((err = (statement))) {                            \
-            syslog(2, #statement " failed: %d", err);   \
-            return err;                                                        \
+        if ((err = (statement)) < 0) {                                         \
+            syslog(2, #statement " failed: %d", err);                          \
+            _exit(1);                                                          \
         }                                                                      \
-    } while (0)
+        err;                                                                   \
+    })
 
 int
 init_termios(int fd) {
@@ -34,18 +35,19 @@ init_termios(int fd) {
     term.c_iflag = ICRNL | IGNBRK;
     term.c_oflag = ONLCR | OPOST;
     term.c_cflag = CREAD | CLOCAL | CS8 | CPARENB;
-    term.c_cc[VERASE] = 0x08;
+    term.c_cc[VERASE] = 0x7f;
 
     check(tcsetattr(fd, 0, &term));
 
     return 0;
 }
 
+const char* sh_argv[] = { "/usr/bin/sh", 0  };
+const char* sh_envp[] = {  0  };
+
 int
 main(int argc, const char** argv)
 {
-    int err = 0;
-
     mkdir("/dev");
     mkdir("/sys");
     mkdir("/task");
@@ -54,26 +56,20 @@ main(int argc, const char** argv)
     must_mount(NULL, "/sys", "twifs", MNT_RO);
     must_mount(NULL, "/task", "taskfs", MNT_RO);
 
-    if ((err = open("/dev/tty", 0)) < 0) {
-        syslog(2, "fail to open tty (%d)\n", errno);
-        return err;
-    }
+    int fd = check(open("/dev/tty", 0));
 
-    check(init_termios(err));
+    check(init_termios(fd));
 
-    if ((err = dup(err)) < 0) {
-        syslog(2, "fail to setup tty i/o (%d)\n", errno);
-        return err;
-    }
+    check(dup(fd));
 
-    if ((err = symlink("/usr", "/mnt/lunaix-os/usr"))) {
-        syslog(2, "symlink /usr:/mnt/lunaix-os/usr (%d)\n", errno);
-        return err;
-    }
+    check(symlink("/usr", "/mnt/lunaix-os/usr"));
 
     pid_t pid;
+    int err = 0;
     if (!(pid = fork())) {
-        err = execve("/usr/bin/sh", NULL, NULL);
+
+        
+        err = execve(sh_argv[0], sh_argv, sh_envp);
         printf("fail to execute (%d)\n", errno);
         _exit(err);
     }
@@ -81,8 +77,10 @@ main(int argc, const char** argv)
     waitpid(pid, &err, 0);
 
     if (WEXITSTATUS(err)) {
-        printf("shell exit abnormally (%d)", err);
+        printf("shell exit abnormally (%d)\n", err);
     }
 
+    printf("init exiting\n");
+
     return err;
 }
\ No newline at end of file