From 21ac9ce01ed4098c4248cfa8e9c2db27844b0673 Mon Sep 17 00:00:00 2001
From: KAAAsS <admin@kaaass.net>
Date: Thu, 21 Apr 2022 22:58:02 +0800
Subject: [PATCH] =?UTF-8?q?Revert=20"memcpy=20=E5=A4=8D=E7=8E=B0"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 54f32e597f03b38978c4ddf551e11cbb6e7e954b.
---
 lab5/user/lab5/apps/init.c      | 20 ++------------------
 lab5/user/lab5/apps/init_test.c |  2 --
 lab5/user/lib/string.c          |  1 -
 3 files changed, 2 insertions(+), 21 deletions(-)

diff --git a/lab5/user/lab5/apps/init.c b/lab5/user/lab5/apps/init.c
index a607369..7531246 100644
--- a/lab5/user/lab5/apps/init.c
+++ b/lab5/user/lab5/apps/init.c
@@ -418,14 +418,6 @@ int fs_read(char *path, off_t offset, ssize_t count) {
     return ret;
 }
 
-void memcpy2(void *dst, const void *src, u64 len)
-{
-    u64 i = 0;
-    for (; i < len; i += 1) {
-        ((u8 *) dst)[i] = ((u8 *) src)[i];
-    }
-}
-
 /**
  * 读入文件并返回长度
  */
@@ -462,16 +454,8 @@ int fs_read_all(char *path, void **ret_buf)
             return cur;
         }
         // FIXME: 此处在 Release 模式下第一次读取前 16 字节为空
-        // memcpy(buf, (const void *) TMPFS_READ_BUF_VADDR, cur);
-        printf("first bytes: %c %c\n", ((u8*) TMPFS_READ_BUF_VADDR)[0],
-               ((u8*) TMPFS_READ_BUF_VADDR)[1]);
-        printf("memcpy %x %x %d\n", buf, (const void *) TMPFS_READ_BUF_VADDR, cur);
-        memcpy2(buf, (const void *) TMPFS_READ_BUF_VADDR, cur);
-//        u64 i = 0;
-//        for (; i < cur; i += 1) {
-//            ((u8 *) buf)[i] = ((u8 *) TMPFS_READ_BUF_VADDR)[i];
-//        }
-
+        memcpy(buf, (const void *) TMPFS_READ_BUF_VADDR, cur);
+        memcpy(buf, (const void *) TMPFS_READ_BUF_VADDR, cur);
         pos += cur;
         buf += cur;
     }
diff --git a/lab5/user/lab5/apps/init_test.c b/lab5/user/lab5/apps/init_test.c
index 4aa908e..58c6b66 100644
--- a/lab5/user/lab5/apps/init_test.c
+++ b/lab5/user/lab5/apps/init_test.c
@@ -43,8 +43,6 @@ int main()
 	usys_fs_load_cpio(CPIO_BIN);
 
 	boot_fs();
-    builtin_cmd("cat tar/cat_test.txt");
-    return 0;
 
 	test_readline();
 	test_echo();
diff --git a/lab5/user/lib/string.c b/lab5/user/lib/string.c
index 3f348a9..5f4893a 100644
--- a/lab5/user/lib/string.c
+++ b/lab5/user/lib/string.c
@@ -1,5 +1,4 @@
 #include <lib/type.h>
-#include "print.h"
 
 /*
  * A very shabby implementation, optimize it if you like.