svnno****@sourc*****
svnno****@sourc*****
2015年 5月 16日 (土) 12:46:18 JST
Tera TermRevision: 5870
http://sourceforge.jp/projects/ttssh2/scm/svn/commits/5870
Author: maya
Date: 2015-05-16 12:46:18 +0900 (Sat, 16 May 2015)
Log Message:
-----------
USE_ATCMDLINE マクロを削除
コマンドライン引数の @@ を @ に置き換えるコードを取っておいた USE_ATCMDLINE マクロを削除
Modified Paths:
--------------
trunk/ttpmenu/ttpmenu.cpp
-------------- next part --------------
Modified: trunk/ttpmenu/ttpmenu.cpp
===================================================================
--- trunk/ttpmenu/ttpmenu.cpp 2015-05-16 02:58:33 UTC (rev 5869)
+++ trunk/ttpmenu/ttpmenu.cpp 2015-05-16 03:46:18 UTC (rev 5870)
@@ -1175,40 +1175,6 @@
strncpy_s(dst, dst_len, str, _TRUNCATE);
}
-#ifdef USE_ATCMDLINE
-// \x8B\xF0 @ \x82ɒu\x82\xAB\x8A\xB7\x82\xA6\x82\xE9\x81B@\x8E\xA9\x90g\x82\xCD@@\x82ɂ\xB7\x82\xE9\x81B(2005.1.28 yutaka)
-static void replace_blank_to_mark(char *str, char *dst, int dst_len)
-{
- int i, len, n;
-
- len = strlen(str);
- n = 0;
- for (i = 0 ; i < len ; i++) {
- if (str[i] == '@')
- n++;
- }
- if (dst_len < (len + 2*n))
- return;
-
- for (i = 0 ; i < len ; i++) {
- if (str[i] == '@') {
- *dst++ = '@';
- *dst++ = '@';
-
- } else if (str[i] == ' ') {
- *dst++ = '@';
-
- } else {
- *dst++ = str[i];
-
- }
- }
- *dst = '\0';
-
-}
-#endif
-
-
/* ==========================================================================
Function Name : (BOOL) ConnectHost()
Outline : \x8E\xA9\x93\xAE\x83\x8D\x83O\x83C\x83\x93\x82܂\xBD\x82̓A\x83v\x83\x8A\x83P\x81[\x83V\x83\x87\x83\x93\x82̎\xC0\x8Ds\x82\xF0\x82\xB7\x82\xE9\x81B
@@ -1303,13 +1269,8 @@
char passwd[MAX_PATH], keyfile[MAX_PATH];
strcpy(tmp, szArgment);
-#ifdef USE_ATCMDLINE
- replace_blank_to_mark(jobInfo.szPassword, passwd, sizeof(passwd));
- replace_blank_to_mark(jobInfo.PrivateKeyFile, keyfile, sizeof(keyfile));
-#else
dquote_string(jobInfo.szPassword, passwd, sizeof(passwd));
dquote_string(jobInfo.PrivateKeyFile, keyfile, sizeof(keyfile));
-#endif
if (jobInfo.bChallenge) { // keyboard-interactive
_snprintf(szArgment, sizeof(szArgment), "%s:22 /ssh /auth=challenge /user=%s /passwd=%s %s",