KAAAsS/ChCore-exercise
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

finish lab5

Browse Source
This commit is contained in:
KAAAsS 2022-04-21 12:10:12 +08:00
parent 8d591c5b06
commit 591104e842
Signed by: KAAAsS
GPG Key ID: D22F53AF662411FE
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lab5/user/lab5/apps/init.c
View File

@ -143,7 +143,7 @@ char *readline(const char *prompt)
// 重置补全计数 // 重置补全计数
complement_time = -1; complement_time = -1;
} }
if (c == '\r') { if (c == '\r' || c == '\n') {
// 回车 // 回车
usys_putc('\n'); usys_putc('\n');
break; break;
@ -331,6 +331,8 @@ int fs_read_all(char *path, void **ret_buf)
if (cur < 0) { if (cur < 0) {
return cur; return cur;
} }
// FIXME: 此处在 Release 模式下第一次读取前 16 字节为空
memcpy(buf, (const void *) TMPFS_READ_BUF_VADDR, cur);
memcpy(buf, (const void *) TMPFS_READ_BUF_VADDR, cur); memcpy(buf, (const void *) TMPFS_READ_BUF_VADDR, cur);
pos += cur; pos += cur;
buf += cur; buf += cur;
@ -419,7 +421,7 @@ int do_echo(char *cmdline)
cmdline += 4; cmdline += 4;
while (*cmdline == ' ') while (*cmdline == ' ')
cmdline++; cmdline++;
printf("%s", cmdline); printf("%s\n", cmdline);
return 0; return 0;
} }