Tera TermRevision: 8087
https://osdn.net/projects/ttssh2/scm/svn/commits/8087
Author: yutakapon
Date: 2019-09-08 11:29:51 +0900 (Sun, 08 Sep 2019)
Log Message:
-----------
non-fatalおよびfatalメッセージボックスの表示に同一メッセージが複数含まれることがある問題を修正した。
branches/ttssh_improvedからリビジョン8053をマージ:
・non-fatalおよびfatal時のエラーメッセージを登録する際、同一メッセージがすでに
登録されていた場合は追加しないようにした。ユーザに同じメッセージを何回見せても
意味がない(むしろ心証がよくない)。
・メモリ確保できない場合の処理を追加した。
........
Modified Paths:
--------------
trunk/doc/en/html/about/history.html
trunk/doc/ja/html/about/history.html
trunk/ttssh2/ttxssh/ttxssh.c
Property Changed:
----------------
trunk/
-------------- next part --------------
Index: trunk
===================================================================
--- trunk 2019-09-07 12:18:28 UTC (rev 8086)
+++ trunk 2019-09-08 02:29:51 UTC (rev 8087)
Property changes on: trunk
___________________________________________________________________
Modified: svn:mergeinfo
## -4,6 +4,6 ##
/branches/portfwd_memleak:7732,7736-7737,7764
/branches/ssh_ed25519:5495-5544
/branches/ttproxy_improved:8041,8055-8056
-/branches/ttssh_improved:8027,8040
+/branches/ttssh_improved:8027,8040,8053
/branches/vs2015_warn:6194-6285
/tags/teraterm-4_89:6182
\ No newline at end of property
Modified: trunk/doc/en/html/about/history.html
===================================================================
--- trunk/doc/en/html/about/history.html 2019-09-07 12:18:28 UTC (rev 8086)
+++ trunk/doc/en/html/about/history.html 2019-09-08 02:29:51 UTC (rev 8087)
@@ -3204,7 +3204,7 @@
<li>Bug fixes
<ul>
- <li></li>
+ <li>The same messages may be included on MessageBox displaying.</li>
</ul>
</li>
</ul>
Modified: trunk/doc/ja/html/about/history.html
===================================================================
--- trunk/doc/ja/html/about/history.html 2019-09-07 12:18:28 UTC (rev 8086)
+++ trunk/doc/ja/html/about/history.html 2019-09-08 02:29:51 UTC (rev 8087)
@@ -3210,7 +3210,7 @@
<li>\x83o\x83O\x8FC\x90\xB3
<ul>
- <li></li>
+ <li>\x83\x81\x83b\x83Z\x81[\x83W\x83{\x83b\x83N\x83X\x82̕\\x8E\xA6\x82ɓ\xAF\x88ꃁ\x83b\x83Z\x81[\x83W\x82\xAA\x95\xA1\x90\x94\x8A܂܂\xEA\x82邱\x82Ƃ\xAA\x82\xA0\x82\xE9\x96\xE2\x91\xE8\x82\xF0\x8FC\x90\xB3\x82\xB5\x82\xBD\x81B</li>
</ul>
</li>
</ul>
Modified: trunk/ttssh2/ttxssh/ttxssh.c
===================================================================
--- trunk/ttssh2/ttxssh/ttxssh.c 2019-09-07 12:18:28 UTC (rev 8086)
+++ trunk/ttssh2/ttxssh/ttxssh.c 2019-09-08 02:29:51 UTC (rev 8087)
@@ -889,12 +889,24 @@
pvar->socket, MAKELPARAM(FD_CLOSE, 0));
}
+// non-fatal\x82\xA8\x82\xE6\x82\xD1fatal\x8E\x9E\x82̃G\x83\x89\x81[\x83\x81\x83b\x83Z\x81[\x83W\x82\xF0\x8Ao\x82\xA6\x82Ă\xA8\x82\xAD\x81B
+// \x88\xEA\x93x\x81A\x8Ao\x82\xA6\x82\xBD\x83\x81\x83b\x83Z\x81[\x83W\x82\xAA\x82\xA0\x82\xEA\x82A\x89\xFC\x8Ds\x82\xF0\x8B\xB2\x82\xF1\x82Œlj\xC1\x82\xB5\x82Ă\xA2\x82\xAD\x81B
static void add_err_msg(PTInstVar pvar, char *msg)
{
if (pvar->err_msg != NULL) {
- int buf_len = strlen(pvar->err_msg) + 3 + strlen(msg);
- char *buf = (char *) malloc(buf_len);
+ int buf_len;
+ char *buf;
+ // \x82\xB7\x82łɓ\xAF\x82\xB6\x83\x81\x83b\x83Z\x81[\x83W\x82\xAA\x93o\x98^\x8Dς݂̏ꍇ\x82͒lj\xC1\x82\xB5\x82Ȃ\xA2\x81B
+ if (strstr(pvar->err_msg, msg))
+ return;
+
+ buf_len = strlen(pvar->err_msg) + 3 + strlen(msg);
+ buf = malloc(buf_len);
+ // \x83\x81\x83\x82\x83\x8A\x82\xAA\x8Am\x95ۂł\xAB\x82Ȃ\xA2\x8Fꍇ\x82͉\xBD\x82\xE0\x82\xB5\x82Ȃ\xA2\x81B
+ if (buf == NULL)
+ return;
+
strncpy_s(buf, buf_len, pvar->err_msg, _TRUNCATE);
strncat_s(buf, buf_len, "\n\n", _TRUNCATE);
strncat_s(buf, buf_len, msg, _TRUNCATE);
@@ -901,6 +913,7 @@
free(pvar->err_msg);
pvar->err_msg = buf;
} else {
+ // \x83\x81\x83\x82\x83\x8A\x82\xAA\x8Am\x95ۂł\xAB\x82Ȃ\xA2\x8Fꍇ\x82́A_strdup()\x82\xCDNULL\x82\xF0\x95Ԃ\xB7\x81B
pvar->err_msg = _strdup(msg);
}
}