DragonOS-Community/DragonOS
4
1
Fork 0
mirror of https://github.com/DragonOS-Community/DragonOS.git synced 2025-06-18 12:16:31 +00:00
Code Issues Releases Wiki Activity

Revert "新的内存管理模块 (#301)" (#302)

Browse Source 
This reverts commit d8ad0a5e77.
This commit is contained in:
LoGin
2023-07-22 16:24:55 +08:00
committed by GitHub
parent d8ad0a5e77
commit bb5f098a86
124 changed files with 5151 additions and 8278 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
user/apps/about/about.c
View File

@ -32,9 +32,6 @@ void print_copyright()
printf(" If you find any problems during use, please visit:\n");
put_string(" https://bbs.DragonOS.org\n", COLOR_ORANGE, COLOR_BLACK);
printf("\n");
printf(" Join our development community:\n");
put_string(" https://DragonOS.zulipchat.com\n", COLOR_ORANGE, COLOR_BLACK);
printf("\n");
}
int main()

27
user/apps/shell/cmd.c
View File

@ -21,21 +21,10 @@ char *shell_current_path = NULL;
*
*/
struct built_in_cmd_t shell_cmds[] = {
{"cd", shell_cmd_cd},
{"cat", shell_cmd_cat},
{"exec", shell_cmd_exec},
{"ls", shell_cmd_ls},
{"mkdir", shell_cmd_mkdir},
{"pwd", shell_cmd_pwd},
{"rm", shell_cmd_rm},
{"rmdir", shell_cmd_rmdir},
{"reboot", shell_cmd_reboot},
{"touch", shell_cmd_touch},
{"about", shell_cmd_about},
{"free", shell_cmd_free},
{"help", shell_help},
{"pipe", shell_pipe_test},
{"kill", shell_cmd_kill},
{"cd", shell_cmd_cd}, {"cat", shell_cmd_cat}, {"exec", shell_cmd_exec}, {"ls", shell_cmd_ls},
{"mkdir", shell_cmd_mkdir}, {"pwd", shell_cmd_pwd}, {"rm", shell_cmd_rm}, {"rmdir", shell_cmd_rmdir},
{"reboot", shell_cmd_reboot}, {"touch", shell_cmd_touch}, {"about", shell_cmd_about}, {"free", shell_cmd_free},
{"help", shell_help}, {"pipe", shell_pipe_test}, {"kill", shell_cmd_kill},
};
// 总共的内建命令数量
@ -621,7 +610,7 @@ int parse_command(char *buf, int *argc, char ***argv)
while (index < INPUT_BUFFER_SIZE && buf[index] == ' ')
++index;
// 如果去除前导空格后第一项为0x00，则归为空命令
if (!buf[index])
if(!buf[index])
return -1;
// 计算参数数量
@ -633,12 +622,12 @@ int parse_command(char *buf, int *argc, char ***argv)
if (buf[i] != ' ' && (buf[i + 1] == ' ' || buf[i + 1] == '\0'))
++(*argc);
}
// printf("\nargc=%d\n", *argc);
// 为指向每个指令的指针分配空间
*argv = (char **)malloc(sizeof(char **) * (*argc + 1));
memset(*argv, 0, sizeof(char **) * (*argc + 1));
*argv = (char **)malloc(sizeof(char **) * (*argc));
memset(*argv, 0, sizeof(char **) * (*argc));
// 将每个命令都单独提取出来
for (int i = 0; i < *argc && index < INPUT_BUFFER_SIZE; ++i)
{

2
user/apps/test_relibc/Makefile
View File

@ -21,4 +21,4 @@ main.o: main.c
$(CC) $(CFLAGS) -c main.c -o main.o
clean:
rm -f *.o
rm -f *.o