mirror of
https://github.com/DragonOS-Community/DragonOS.git
synced 2025-06-18 20:36:31 +00:00
Patch refactor scm and textui (#289)
* 重构屏幕管理器和textui框架 * 切换字体为spleen,并增加对字体的抽象 * 修正文档 --------- Co-authored-by: longjin <longjin@RinGoTek.cn>
This commit is contained in:
@ -506,6 +506,7 @@ int shell_cmd_exec(int argc, char **argv)
|
||||
int path_len = 0;
|
||||
char *file_path = get_target_filepath(argv[1], &path_len);
|
||||
// printf("before execv, path=%s, argc=%d\n", file_path, argc);
|
||||
|
||||
execv(file_path, argv);
|
||||
// printf("after execv, path=%s, argc=%d\n", file_path, argc);
|
||||
free(argv);
|
||||
@ -520,13 +521,14 @@ int shell_cmd_exec(int argc, char **argv)
|
||||
waitpid(pid, &retval, 0);
|
||||
else
|
||||
printf("[1] %d\n", pid); // 输出子进程的pid
|
||||
|
||||
|
||||
free(argv);
|
||||
}
|
||||
}
|
||||
|
||||
int shell_cmd_about(int argc, char **argv)
|
||||
{
|
||||
|
||||
if (argv != NULL)
|
||||
free(argv);
|
||||
int aac = 0;
|
||||
|
@ -79,8 +79,12 @@ void main_loop(int kb_fd)
|
||||
strcpy(command_origin, input_buffer);
|
||||
int cmd_num = parse_command(input_buffer, &argc, &argv);
|
||||
printf("\n");
|
||||
|
||||
|
||||
if (cmd_num >= 0)
|
||||
shell_run_built_in_command(cmd_num, argc, argv);
|
||||
|
||||
|
||||
}
|
||||
else
|
||||
printf("\n");
|
||||
|
@ -155,6 +155,7 @@ int execv(const char *path, char *const argv[])
|
||||
errno = -ENOENT;
|
||||
return -1;
|
||||
}
|
||||
|
||||
int retval = syscall_invoke(SYS_EXECVE, (uint64_t)path, (uint64_t)argv, 0, 0, 0, 0, 0, 0);
|
||||
if (retval != 0)
|
||||
return -1;
|
||||
|
Reference in New Issue
Block a user