!12 update bin. code check happy

Merge pull request !12 from zako/master

prebuilt/README_zh.md

@@ -0,0 +1,11 @@
+# 几点说明:
+
+[1.通过git clone方式下载](#section662115419449)
+建议通过gitclone方式下载该仓 命令为:
+**git clone git@gitee.com:openharmony/developtools_hdc_standard.git**
+
+[2.通过网页形式下载](#section15908143623714)
+通过网页形式下载prebuilt，请 使用类似如下URL打开网页  https://gitee.com/openharmony/developtools_hdc_standard/blob/master/prebuilt/windows/hdc-std.exe ，点击中间下载方式进行下载，windows版本文件大小在**5M左右**，linux版本在**2M左右**，不要使用右击另存为方式进行保存下载，下载后检查文件大小。
+
+[3.支持环境](#section161941989596)
+支持运行环境 linux版本建议ubuntu20 CentOS8 64位，其他版本相近也应该可以，libc++.so引用错误请使用ldd\readelf等命令检查库引用 windows版本建议windows10 64位，windows8也应该可以，Windows7等EOF版本尚未测试，如果低版本windows winusb库缺失，请使用zadia更新库。

src/common/base.cpp

@@ -164,13 +164,14 @@ namespace Base {
         va_end(ap);
     }
 
+    // if can linkwith -lstdc++fs, use std::filesystem::path(path).filename();
     string GetFileNameAny(string &path)
     {
-        // if can linkwith -lstdc++fs, use std::filesystem::path(path).filename();
         string tmpString = path;
-        size_t tmpNum = 0;
-        if ((tmpNum = tmpString.rfind('/')) == std::string::npos) {
-            if ((tmpNum = tmpString.rfind('\\')) == std::string::npos) {
+        size_t tmpNum = tmpString.rfind('/');
+        if (tmpNum == std::string::npos) {
+            tmpNum = tmpString.rfind('\\');
+            if (tmpNum == std::string::npos) {
                 return tmpString;
             }
         }
@@ -1098,7 +1099,7 @@ namespace Base {
         uv_os_sock_t dupFd = -1;
 #ifdef _WIN32
         WSAPROTOCOL_INFO info;
-        memset(&info, 0, sizeof(info));
+        ZeroStruct(info);
         if (WSADuplicateSocketA(tcp->socket, GetCurrentProcessId(), &info) < 0) {
             return dupFd;
         }

src/host/server.cpp

@@ -211,6 +211,26 @@ string HdcServer::GetDaemonMapList(uint8_t opType)
     return ret;
 }
 
+void HdcServer::GetDaemonMapOnlyOne(HDaemonInfo &hDaemonInfoInOut)
+{
+    uv_rwlock_rdlock(&daemonAdmin);
+    string key;
+    for (auto &i : mapDaemon) {
+        if (i.second->connStatus == STATUS_CONNECTED) {
+            if (key == STRING_EMPTY) {
+                key = i.first;
+            } else {
+                key = STRING_EMPTY;
+                break;
+            }
+        }
+    }
+    if (key.size() > 0) {
+        hDaemonInfoInOut = mapDaemon[key];
+    }
+    uv_rwlock_rdunlock(&daemonAdmin);
+}
+
 string HdcServer::AdminDaemonMap(uint8_t opType, const string &connectKey, HDaemonInfo &hDaemonInfoInOut)
 {
     string sRet;
@@ -261,22 +281,7 @@ string HdcServer::AdminDaemonMap(uint8_t opType, const string &connectKey, HDaem
             break;
         }
         case OP_GET_ONLY: {
-            uv_rwlock_rdlock(&daemonAdmin);
-            string key;
-            for (auto &i : mapDaemon) {
-                if (i.second->connStatus == STATUS_CONNECTED) {
-                    if (key == STRING_EMPTY) {
-                        key = i.first;
-                    } else {
-                        key = STRING_EMPTY;
-                        break;
-                    }
-                }
-            }
-            if (key.size() > 0) {
-                hDaemonInfoInOut = mapDaemon[key];
-            }
-            uv_rwlock_rdunlock(&daemonAdmin);
+            GetDaemonMapOnlyOne(hDaemonInfoInOut);
             break;
         }
         case OP_UPDATE: {  // Cannot update the Object HDi lower key value by direct value

src/host/server.h

@@ -52,6 +52,7 @@ private:
     bool HandServerAuth(HSession hSession, SessionHandShake &handshake);
     string GetDaemonMapList(uint8_t opType);
     bool ServerSessionHandshake(HSession hSession, uint8_t *payload, int payloadSize);
+    void GetDaemonMapOnlyOne(HDaemonInfo &hDaemonInfoInOut);
 
     uv_rwlock_t daemonAdmin;
     map<string, HDaemonInfo> mapDaemon;

src/test/hdc_runtime_command.cpp

@@ -112,13 +112,14 @@ int TestTaskCommand(int method, const string &debugServerPort, const string &deb
                           "install /d/a.hap /mnt/hgfs/vtmp/b.hap /mnt/hgfs/vtmp -lrtsdpg");  // hap
             break;
         case UT_TEST_TMP:
+            TestRunClient(debugServerPort, debugConnectKey, "shell pwd");
+#ifdef DEF_NULL
             while (true) {
                 uv_sleep(50);
                 TestRunClient(debugServerPort, debugConnectKey, "list targets");
                 TestRunClient(debugServerPort, debugConnectKey, "shell id");
                 TestRunClient(debugServerPort, debugConnectKey, "shell bm dump -a");
             }
-#ifdef DEF_NULL
             TestRunClient(debugServerPort, debugConnectKey, "install /d/helloworld.hap");
             TestRunClient(debugServerPort, debugConnectKey, "target mount");
             TestRunClient(debugServerPort, debugConnectKey, "shell pwd");