使得 xinit 可以连接到 Xorg 并进入黑屏

Author: lihanrui2913

.gitignore

@@ -37,3 +37,6 @@ assets/*.elf
 # AI Agent Cache
 .codex
 AGENTS.md
+
+# Log files
+*.log

libs/liballoc-x86_64.a

@@ -5,7 +5,7 @@ static errno_t squashfs_id         = -1;
 static sqfs_u64 squashfs_mount_dev = 1;
 errno_t errno                      = EOK;
 
-#define SQUASHFS_IMAGE_CACHE_SIZE 262144ULL
+#define SQUASHFS_IMAGE_CACHE_SIZE  262144ULL
 #define SQUASHFS_IMAGE_CACHE_ALIGN 4096ULL
 
 typedef struct {
@@ -25,8 +25,9 @@ typedef struct {
 } squashfs_compressor_stub_t;
 
 static void squashfs_open(void *parent, const char *name, vfs_node_t node);
-static squashfs_handle_t *
-squashfs_handle_create(squashfs_mount_t *mount, sqfs_inode_generic_t *inode, const sqfs_u64 inode_ref);
+static squashfs_handle_t *squashfs_handle_create(
+    squashfs_mount_t *mount, sqfs_inode_generic_t *inode, const sqfs_u64 inode_ref
+);
 
 static void squashfs_handle_release(squashfs_handle_t *handle) {
     if (handle == NULL) {
@@ -446,7 +447,7 @@ int squashfs_populate_dir(const vfs_node_t node, const squashfs_handle_t *handle
         return 0;
     }
 
-    mount = handle->mount;
+    mount      = handle->mount;
     dir_reader = squashfs_create_directory_reader(mount);
     if (dir_reader == NULL) {
         return SQFS_ERROR_ALLOC;
@@ -731,13 +732,12 @@ static size_t squashfs_read(void *file, void *addr, size_t offset, size_t size)
     squashfs_handle_t *handle = file;
     sqfs_s32 ret;
 
-    spin_lock(handle->lock);
-
     if (handle == NULL || addr == NULL) {
-        spin_unlock(handle->lock);
         return (size_t)-1;
     }
 
+    spin_lock(handle->lock);
+
     if (handle->inode->base.type != SQFS_INODE_FILE
         && handle->inode->base.type != SQFS_INODE_EXT_FILE) {
         spin_unlock(handle->lock);

module/squashfs/squashfs.c

@@ -483,7 +483,9 @@ shebang_retry:;
                 action->sa_restorer = NULL;
             }
         }
-        current->signal = 0; // clear pending signals
+        current->signal               = 0; // clear pending signals
+        current->pending_siginfo_mask = 0;
+        memset(current->pending_siginfo, 0, sizeof(current->pending_siginfo));
     }
 
     // 根据 POSIX 的 execve 规范定义, 内核对象不变, 故懒分配器, IPC等不动

src/arch/x86_64/task/prsys_x64.c

@@ -17,6 +17,45 @@ static struct llist_header tty_session_list;
 static tty_t *kernel_session  = NULL; // 内核会话
 static tty_t *current_session = NULL; // 当前会话
 
+static void tty_session_node_name(const tty_t *session, char *buf, size_t buf_len) {
+    if (!buf || buf_len == 0) {
+        return;
+    }
+
+    buf[0] = '\0';
+    if (!session || !session->device) {
+        return;
+    }
+
+    int graphics_idx = 1;
+    int serial_idx   = 1;
+    tty_t *pos       = NULL;
+    tty_t *n         = NULL;
+    llist_for_each(pos, n, &tty_session_list, list_node) {
+        if (!pos || !pos->device) {
+            continue;
+        }
+
+        if (pos->device->type == TTY_DEVICE_SERIAL) {
+            if (pos == session) {
+                snprintf(buf, buf_len, "ttyS%d", serial_idx);
+                return;
+            }
+            serial_idx++;
+            continue;
+        }
+
+        if (pos == session) {
+            snprintf(buf, buf_len, "tty%d", graphics_idx);
+            return;
+        }
+        graphics_idx++;
+    }
+
+    strncpy(buf, session->device->name, buf_len - 1);
+    buf[buf_len - 1] = '\0';
+}
+
 tty_t *get_kernel_session() {
     return kernel_session;
 }
@@ -257,9 +296,11 @@ static errno_t tty_ioctl(tty_t *session, const size_t req, void *arg) {
         if (proc->ctty_path) {
             free(proc->ctty_path);
         }
-        char buf[64];
-        snprintf(buf, sizeof(buf), "/dev/%s", session->device ? session->device->name : "tty0");
-        proc->ctty_path = strdup(buf);
+        char tty_name[32];
+        char path[64];
+        tty_session_node_name(session, tty_name, sizeof(tty_name));
+        snprintf(path, sizeof(path), "/dev/%s", tty_name[0] ? tty_name : "tty1");
+        proc->ctty_path = strdup(path);
         session->fgproc = proc->pgid;
         break;
     }
@@ -606,16 +647,16 @@ void init_tty_session() {
 
 void init_console_symlink() {
     const char *console = boot_get_cmdline_param("console");
-    if (console == NULL) {
-        console = "tty0";
-    }
-
     char buf[50];
-    sprintf(buf, "/dev/%s", console);
+    if (console == NULL || streq(console, "tty0")) {
+        strcpy(buf, "/dev/tty1");
+    } else {
+        sprintf(buf, "/dev/%s", console);
+    }
 
     const vfs_node_t console_node = vfs_open(buf);
     if (console_node == NULL) {
-        strcpy(buf, "/dev/tty0");
+        strcpy(buf, "/dev/tty1");
     } else {
         vfs_close(console_node);
     }

src/driver/tty.c

@@ -16,34 +16,16 @@ int dev_tmpfs_id                          = 0;
 static _Atomic volatile size_t dev_id_now = 0;
 
 static void load_tty_device(vfs_node_t node) {
-    int tty_id = 1;
-
-    tty_t *kernel_session = get_kernel_session();
-    create_device_node(
-        node,
-        "tty0",
-        device_stream,
-        kernel_session,
-        0,
-        (void *)kernel_session->ops.ioctl,
-        (void *)kernel_session->ops.read,
-        (void *)kernel_session->ops.write,
-        (void *)kernel_session->ops.poll,
-        NULL,
-        (void *)kernel_session->ops.size_t
-    );
-
-    tty_t *pos = NULL;
-    tty_t *n   = NULL;
+    int graphics_id = 1;
+    int serial_id   = 1;
+    tty_t *pos      = NULL;
+    tty_t *n        = NULL;
     llist_for_each(pos, n, get_tty_session_list(), list_node) {
-        if (pos == kernel_session) {
-            continue;
-        }
         char name[10];
         if (pos->device->type == TTY_DEVICE_SERIAL) {
-            sprintf(name, "ttyS%d", tty_id++);
+            sprintf(name, "ttyS%d", serial_id++);
         } else {
-            sprintf(name, "tty%d", tty_id++);
+            sprintf(name, "tty%d", graphics_id++);
         }
 
         create_device_node(
@@ -60,6 +42,10 @@ static void load_tty_device(vfs_node_t node) {
             (void *)pos->ops.size_t
         );
     }
+
+    if (graphics_id > 1) {
+        vfs_symlink("/dev/tty0", "/dev/tty1");
+    }
 }
 
 static void load_blk_device(vfs_node_t node) {