Tera TermRevision: 7948
https://osdn.net/projects/ttssh2/scm/svn/commits/7948
Author: maya
Date: 2019-08-13 22:18:05 +0900 (Tue, 13 Aug 2019)
Log Message:
-----------
SCP 転送ダイアログを閉じるとき、常に FileDir, ScpSendDir に反映するようにした
Modified Paths:
--------------
trunk/doc/en/html/about/history.html
trunk/doc/ja/html/about/history.html
trunk/ttssh2/ttxssh/ttxssh.c
-------------- next part --------------
Modified: trunk/doc/en/html/about/history.html
===================================================================
--- trunk/doc/en/html/about/history.html 2019-08-13 11:58:42 UTC (rev 7947)
+++ trunk/doc/en/html/about/history.html 2019-08-13 13:18:05 UTC (rev 7948)
@@ -3170,6 +3170,7 @@
<li>Bug fixes
<ul>
<li>SSH2: When SSH communication is slow by using port forwarding, an application fault is occurred due to increase memory consumption.</li>
+ <!--li>SSH2: SCP \x93]\x91\x97\x83_\x83C\x83A\x83\x8D\x83O\x82\xF0\x95\xB6\x82\xE9\x82Ƃ\xAB\x82ɁA\x83t\x83@\x83C\x83\x8B\x93]\x91\x97\x83f\x83B\x83\x8C\x83N\x83g\x83\x8A\x90ݒ\xE8\x81ESCP\x91\x97\x90M\x90\xE6\x83p\x83X\x90ݒ肪\x8DX\x90V\x82\xB3\x82\xEA\x82Ȃ\xA2\x82\xB1\x82Ƃ\xAA\x82\xA0\x82\xE9\x96\xE2\x91\xE8\x82\xF0\x8FC\x90\xB3\x82\xB5\x82\xBD\x81B</li-->
<li>SSH1: When the destination port number is other than 22, an application fault may be occurred after the host key is newly written to known_hosts file.</li>
<li>SSH1: The rhosts authentication could not be performed at all.</li>
</ul>
Modified: trunk/doc/ja/html/about/history.html
===================================================================
--- trunk/doc/ja/html/about/history.html 2019-08-13 11:58:42 UTC (rev 7947)
+++ trunk/doc/ja/html/about/history.html 2019-08-13 13:18:05 UTC (rev 7948)
@@ -3176,6 +3176,7 @@
<li>\x83o\x83O\x8FC\x90\xB3
<ul>
<li>SSH2: \x83|\x81[\x83g\x93]\x91\x97\x82\xC5SSH\x92ʐM\x82\xAA\x92x\x82\xA2\x8Fꍇ\x82ɂ\xA8\x82\xA2\x82āA\x8F\xC1\x94\x83\x82\x83\x8A\x82\xAA\x94\xEC\x91剻\x82\xB5\x82ăA\x83v\x83\x8A\x82\xAA\x97\x8E\x82\xBF\x82\xE9\x96\xE2\x91\xE8\x82\xF0\x8FC\x90\xB3\x82\xB5\x82\xBD\x81B</li>
+ <li>SSH2: SCP \x93]\x91\x97\x83_\x83C\x83A\x83\x8D\x83O\x82\xF0\x95\xB6\x82\xE9\x82Ƃ\xAB\x82ɁA\x83t\x83@\x83C\x83\x8B\x93]\x91\x97\x83f\x83B\x83\x8C\x83N\x83g\x83\x8A\x90ݒ\xE8\x81ESCP\x91\x97\x90M\x90\xE6\x83p\x83X\x90ݒ肪\x8DX\x90V\x82\xB3\x82\xEA\x82Ȃ\xA2\x82\xB1\x82Ƃ\xAA\x82\xA0\x82\xE9\x96\xE2\x91\xE8\x82\xF0\x8FC\x90\xB3\x82\xB5\x82\xBD\x81B</li>
<li>SSH1: \x90ڑ\xB1\x90\xE6\x82̃|\x81[\x83g\x94ԍ\x86\x82\xAA22\x88ȊO\x82ŁA\x90V\x8BK\x82\xC9known_hosts\x83t\x83@\x83C\x83\x8B\x82փz\x83X\x83g\x8C\xAE\x82\xF0\x8F\x91\x82\xAB\x8D\x9E\x82ގ\x9E\x81A\x83A\x83v\x83\x8A\x82\xAA\x97\x8E\x82\xBF\x82邱\x82Ƃ\xAA\x82\xA0\x82\xE9\x96\xE2\x91\xE8\x82\xF0\x8FC\x90\xB3\x82\xB5\x82\xBD\x81B</li>
<li>SSH1: rhosts\x94F\x8F\xAA\x82ł\xAB\x82Ȃ\xAD\x82Ȃ\xC1\x82Ă\xA2\x82\xBD\x96\xE2\x91\xE8\x82\xF0\x8FC\x90\xB3\x82\xB5\x82\xBD\x81B</li>
</ul>
Modified: trunk/ttssh2/ttxssh/ttxssh.c
===================================================================
--- trunk/ttssh2/ttxssh/ttxssh.c 2019-08-13 11:58:42 UTC (rev 7947)
+++ trunk/ttssh2/ttxssh/ttxssh.c 2019-08-13 13:18:05 UTC (rev 7948)
@@ -3886,6 +3886,11 @@
SendMessage(hWnd, WM_GETTEXT , sizeof(sendfiledir), (LPARAM)sendfiledir);
strncpy_s(pvar->ts->ScpSendDir, sizeof(pvar->ts->ScpSendDir), sendfiledir, _TRUNCATE);
+ // \x8E\xF3\x90M\x83p\x83X\x82\xF0\x8E\xE6\x82\xE8\x8Fo\x82\xB5\x81Ats->FileDir \x82\xE0\x8D\x87\x82킹\x82čX\x90V\x82\xB7\x82\xE9\x81B
+ hWnd = GetDlgItem(dlg, IDC_RECVFILE_TO);
+ SendMessage(hWnd, WM_GETTEXT , sizeof(recvdir), (LPARAM)recvdir);
+ strncpy_s(pvar->ts->FileDir, sizeof(pvar->ts->FileDir), recvdir, _TRUNCATE);
+
SSH_start_scp(pvar, sendfile, sendfiledir);
//SSH_scp_transaction(pvar, "bigfile30.bin", "", FROMREMOTE);
EndDialog(dlg, 1); // dialog close
@@ -3914,6 +3919,17 @@
char recvpath[MAX_PATH] = "";
char* fn = strrchr(szFileName, '/');
char recvfn[sizeof(szFileName)];
+
+ // \x91\x97\x90M\x83p\x83X\x82\xF0\x8E\xE6\x82\xE8\x8Fo\x82\xB5\x81Ats->ScpSendDir \x82\xE0\x8D\x87\x82킹\x82čX\x90V\x82\xB7\x82\xE9\x81B
+ hWnd = GetDlgItem(dlg, IDC_SENDFILE_TO);
+ SendMessage(hWnd, WM_GETTEXT , sizeof(sendfiledir), (LPARAM)sendfiledir);
+ strncpy_s(pvar->ts->ScpSendDir, sizeof(pvar->ts->ScpSendDir), sendfiledir, _TRUNCATE);
+
+ // \x8E\xF3\x90M\x83p\x83X\x82\xF0\x8E\xE6\x82\xE8\x8Fo\x82\xB5\x81Ats->FileDir \x82\xE0\x8D\x87\x82킹\x82čX\x90V\x82\xB7\x82\xE9\x81B
+ hWnd = GetDlgItem(dlg, IDC_RECVFILE_TO);
+ SendMessage(hWnd, WM_GETTEXT , sizeof(recvdir), (LPARAM)recvdir);
+ strncpy_s(pvar->ts->FileDir, sizeof(pvar->ts->FileDir), recvdir, _TRUNCATE);
+
if (fn) {
fn++;
if (*fn == '\0') {
@@ -3925,7 +3941,6 @@
}
strncpy_s(recvfn, sizeof(recvfn), fn, _TRUNCATE);
replaceInvalidFileNameChar(recvfn, '_');
- SendMessage(GetDlgItem(dlg, IDC_RECVFILE_TO), WM_GETTEXT, sizeof(recvdir), (LPARAM)recvdir);
_snprintf_s(recvpath, sizeof(recvpath), _TRUNCATE, "%s\\%s", recvdir, recvfn);
SSH_scp_transaction(pvar, szFileName, recvpath, FROMREMOTE);
EndDialog(dlg, 1); // dialog close