From 7149abaa49a4ca70f0e42ad3b61fdfd6a941a092 Mon Sep 17 00:00:00 2001
From: HoshuChiu <129569557+HoshuChiu@users.noreply.github.com>
Date: Sun, 16 Apr 2023 14:47:51 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8DIssue#220=EF=BC=9Bvnc?=
 =?UTF-8?q?=E7=9A=84=E7=AB=AF=E5=8F=A3=E5=8F=B7=E6=81=A2=E5=A4=8D5900=20(#?=
 =?UTF-8?q?243)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* 修复Issue#220

* qemu-vnc端口号恢复为5900
---
 tools/run-qemu.sh     | 2 +-
 user/apps/shell/cmd.c | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/tools/run-qemu.sh b/tools/run-qemu.sh
index 5b40c6e9..7b5a0f63 100644
--- a/tools/run-qemu.sh
+++ b/tools/run-qemu.sh
@@ -50,7 +50,7 @@ if [ $flag_can_run -eq 1 ]; then
         --display)
         case "$2" in
               vnc)
-              QEMU_ARGUMENT+=" -display vnc=:5900"
+              QEMU_ARGUMENT+=" -display vnc=:00"
               ;;
               window)
               ;;
diff --git a/user/apps/shell/cmd.c b/user/apps/shell/cmd.c
index 72545c8a..64cacb8d 100644
--- a/user/apps/shell/cmd.c
+++ b/user/apps/shell/cmd.c
@@ -600,7 +600,7 @@ done:;
  * @param buf 输入缓冲区
  * @param argc 返回值：参数数量
  * @param argv 返回值：参数列表
- * @return int 主命令的编号
+ * @return int 主命令的编号，小于零为无效命令
  */
 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] == ' ')
         ++index;
+    // 如果去除前导空格后第一项为0x00，则归为空命令
+    if(!buf[index])
+        return -1;
 
     // 计算参数数量
     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'))
             ++(*argc);
     }
-
+    
     // printf("\nargc=%d\n", *argc);
 
     // 为指向每个指令的指针分配空间