From 591104e8427ed9d7264b799d1c00299a20ed0818 Mon Sep 17 00:00:00 2001 From: KAAAsS Date: Thu, 21 Apr 2022 12:10:12 +0800 Subject: [PATCH] finish lab5 --- lab5/user/lab5/apps/init.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/lab5/user/lab5/apps/init.c b/lab5/user/lab5/apps/init.c index 91459f8..a3f1ae9 100644 --- a/lab5/user/lab5/apps/init.c +++ b/lab5/user/lab5/apps/init.c @@ -143,7 +143,7 @@ char *readline(const char *prompt) // 重置补全计数 complement_time = -1; } - if (c == '\r') { + if (c == '\r' || c == '\n') { // 回车 usys_putc('\n'); break; @@ -331,6 +331,8 @@ int fs_read_all(char *path, void **ret_buf) if (cur < 0) { return cur; } + // FIXME: 此处在 Release 模式下第一次读取前 16 字节为空 + memcpy(buf, (const void *) TMPFS_READ_BUF_VADDR, cur); memcpy(buf, (const void *) TMPFS_READ_BUF_VADDR, cur); pos += cur; buf += cur; @@ -419,7 +421,7 @@ int do_echo(char *cmdline) cmdline += 4; while (*cmdline == ' ') cmdline++; - printf("%s", cmdline); + printf("%s\n", cmdline); return 0; }