DragonOS-Community/DragonOS
4
1
Fork 0
mirror of https://github.com/DragonOS-Community/DragonOS.git synced 2025-06-11 21:36:46 +00:00
Code Issues Releases Wiki Activity

修复Issue#220；vnc的端口号恢复5900 (#243)

Browse Source 
* 修复Issue#220

* qemu-vnc端口号恢复为5900
This commit is contained in:
HoshuChiu 2023-04-16 14:47:51 +08:00 committed by GitHub
parent 5c1e552cc7
commit 7149abaa49
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tools/run-qemu.sh
View File

@ -50,7 +50,7 @@ if [ $flag_can_run -eq 1 ]; then
--display) --display)
case "$2" in case "$2" in
vnc) vnc)
QEMU_ARGUMENT+=" -display vnc=:5900" QEMU_ARGUMENT+=" -display vnc=:00"
;; ;;
window) window)
;; ;;

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

@ -600,7 +600,7 @@ done:;
* @param buf 输入缓冲区 * @param buf 输入缓冲区
* @param argc 返回值：参数数量 * @param argc 返回值：参数数量
* @param argv 返回值：参数列表 * @param argv 返回值：参数列表
* @return int 主命令的编号 * @return int 主命令的编号，小于零为无效命令
*/ */
int parse_command(char *buf, int *argc, char ***argv) int parse_command(char *buf, int *argc, char ***argv)
{ {
@ -609,6 +609,9 @@ int parse_command(char *buf, int *argc, char ***argv)
// 去除命令前导的空格 // 去除命令前导的空格
while (index < INPUT_BUFFER_SIZE && buf[index] == ' ') while (index < INPUT_BUFFER_SIZE && buf[index] == ' ')
++index; ++index;
// 如果去除前导空格后第一项为0x00，则归为空命令
if(!buf[index])
return -1;
// 计算参数数量 // 计算参数数量
for (int i = index; i < (INPUT_BUFFER_SIZE - 1); ++i) for (int i = index; i < (INPUT_BUFFER_SIZE - 1); ++i)
@ -619,7 +622,7 @@ int parse_command(char *buf, int *argc, char ***argv)
if (buf[i] != ' ' && (buf[i + 1] == ' ' || buf[i + 1] == '\0')) if (buf[i] != ' ' && (buf[i + 1] == ' ' || buf[i + 1] == '\0'))
++(*argc); ++(*argc);
} }
// printf("\nargc=%d\n", *argc); // printf("\nargc=%d\n", *argc);
// 为指向每个指令的指针分配空间 // 为指向每个指令的指针分配空间