From b2a2316e96b7791bc5276c4207725e346ab298b8 Mon Sep 17 00:00:00 2001 From: ApexLiu Date: Sun, 26 Nov 2017 22:34:37 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3macOS=E7=89=88=E5=8A=A9?= =?UTF-8?q?=E6=89=8B=E8=AE=BE=E7=BD=AE=E7=95=8C=E9=9D=A2=E5=B1=95=E7=A4=BA?= =?UTF-8?q?=E4=B8=8D=E4=BA=86=E7=9A=84=E9=97=AE=E9=A2=98=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- client/tp_assist_macos/src/csrc/ts_env.cpp | 32 ++++------------------ common/libex/src/ex_ini.cpp | 1 - 2 files changed, 5 insertions(+), 28 deletions(-) diff --git a/client/tp_assist_macos/src/csrc/ts_env.cpp b/client/tp_assist_macos/src/csrc/ts_env.cpp index 46a7508..388cdad 100644 --- a/client/tp_assist_macos/src/csrc/ts_env.cpp +++ b/client/tp_assist_macos/src/csrc/ts_env.cpp @@ -24,34 +24,12 @@ bool TsEnv::init(const char* cfg_file, const char* res_path) ex_astr2wstr(cfg_file, m_cfg_file); ex_astr2wstr(res_path, m_res_path); -// if (!ex_exec_file(m_exec_file)) -// return false; -// -// m_exec_path = m_exec_file; -// if (!ex_dirname(m_exec_path)) -// return false; -// -// m_ssh_client_conf_file = m_exec_path; -// ex_path_join(m_ssh_client_conf_file, false, L"cfg", L"ssh.ini", NULL); -// -// m_scp_client_conf_file = m_exec_path; -// ex_path_join(m_scp_client_conf_file, false, L"cfg", L"scp.ini", NULL); -// -// m_telnet_client_conf_file = m_exec_path; -// ex_path_join(m_telnet_client_conf_file, false, L"cfg", L"telnet.ini", NULL); -// -// m_log_path = m_exec_path; -// ex_path_join(m_log_path, false, L"log", NULL); - -#ifdef EX_DEBUG - m_site_path = L"/Users/apex/work/eomsoft/teleport-dev/client/tp_assist_macos/site"; -#else +//#ifdef EX_DEBUG +// m_site_path = L"/Users/apex/work/eomsoft/teleport-dev/client/tp_assist_macos/site"; +//#else m_site_path = m_res_path; - ex_path_join(m_res_path, false, L"site", NULL); -#endif + ex_path_join(m_site_path, false, L"site", NULL); +//#endif -// m_tools_path = m_exec_path; -// ex_path_join(m_tools_path, false, L"tools", NULL); - return true; } diff --git a/common/libex/src/ex_ini.cpp b/common/libex/src/ex_ini.cpp index 7660f7c..669b890 100644 --- a/common/libex/src/ex_ini.cpp +++ b/common/libex/src/ex_ini.cpp @@ -275,7 +275,6 @@ bool ExIniFile::LoadFromMemory(const ex_wstr& strData, bool bClearOld) posLF = ex_wstr::npos; posCR = strAll.find(L"\r"); posLF = strAll.find(L"\n"); - int tttt = 0; if(posCR == ex_wstr::npos && posLF == ex_wstr::npos) { if (strAll.empty())