Tera TermRevision: 11009
https://osdn.net/projects/ttssh2/scm/svn/commits/11009
Author: zmatsuo
Date: 2023-10-16 23:53:44 +0900 (Mon, 16 Oct 2023)
Log Message:
-----------
マクロコマンド strjoin で連結文字列を設定する変数を誤っていたので修正
- 連結元の最後の変数に連結文字列を設定していた
ticket #48858
Ticket Links:
------------
https://osdn.net/projects/ttssh2/tracker/detail/48858
Modified Paths:
--------------
trunk/doc/en/html/about/history.html
trunk/doc/ja/html/about/history.html
trunk/teraterm/ttpmacro/ttl.cpp
-------------- next part --------------
Modified: trunk/doc/en/html/about/history.html
===================================================================
--- trunk/doc/en/html/about/history.html 2023-10-16 09:25:26 UTC (rev 11008)
+++ trunk/doc/en/html/about/history.html 2023-10-16 14:53:44 UTC (rev 11009)
@@ -31,6 +31,25 @@
<h2 id="teraterm">Tera Term</h2>
+<h3 id="teraterm_5.1">YYYY.MM.DD (Ver 5.1, not yet released)</h3>
+<ul class="history">
+ <!-- li>Changes
+ <ul>
+ </ul>
+ </li -->
+
+ <li>Bug fixes
+ <ul>
+ <li>MACRO: <a href="../macro/command/strjoin.html">strjoin</a> command set concatenated string to the wrong variable.</li>
+ </ul>
+ </li>
+
+ <!-- li>Misc
+ <ul>
+ </ul>
+ </li -->
+</ul>
+
<h3 id="teraterm_5.0">2023.10.15 (Ver 5.0)</h3>
<ul class="history">
<li>Changes
Modified: trunk/doc/ja/html/about/history.html
===================================================================
--- trunk/doc/ja/html/about/history.html 2023-10-16 09:25:26 UTC (rev 11008)
+++ trunk/doc/ja/html/about/history.html 2023-10-16 14:53:44 UTC (rev 11009)
@@ -31,6 +31,25 @@
<h2 id="teraterm">Tera Term</h2>
+<h3 id="teraterm_5.1">YYYY.MM.DD (Ver 5.1, not yet released)</h3>
+<ul class="history">
+ <!-- li>\x95ύX
+ <ul>
+ </ul>
+ </li -->
+
+ <li>\x83o\x83O\x8FC\x90\xB3
+ <ul>
+ <li><a href="../macro/command/strjoin.html">strjoin</a> \x83}\x83N\x83\x8D\x83R\x83}\x83\x93\x83h\x82ŁA\x98A\x8C\x8B\x95\xB6\x8E\x9A\x97\xF1\x82\xF0\x8C\xEB\x82\xC1\x82\xBD\x95ϐ\x94\x82փZ\x83b\x83g\x82\xB5\x82Ă\xA2\x82\xBD\x96\xE2\x91\xE8\x82\xF0\x8FC\x90\xB3\x82\xB5\x82\xBD\x81B</li>
+ </ul>
+ </li>
+
+ <!-- li>\x82\xBB\x82̑\xBC
+ <ul>
+ </ul>
+ </li -->
+</ul>
+
<h3 id="teraterm_5.0">2023.10.15 (Ver 5.0)</h3>
<ul class="history">
<li>\x95ύX
Modified: trunk/teraterm/ttpmacro/ttl.cpp
===================================================================
--- trunk/teraterm/ttpmacro/ttl.cpp 2023-10-16 09:25:26 UTC (rev 11008)
+++ trunk/teraterm/ttpmacro/ttl.cpp 2023-10-16 14:53:44 UTC (rev 11009)
@@ -5046,12 +5046,12 @@
#undef MAXVARNUM
}
-WORD TTLStrJoin()
+static WORD TTLStrJoin(void)
{
#define MAXVARNUM 9
TStrVal delimchars, buf;
WORD Err;
- TVarId VarId;
+ TVarId TargetVarId;
WORD VarType;
int maxvar;
int i;
@@ -5060,7 +5060,7 @@
const char *p;
Err = 0;
- GetStrVar(&VarId,&Err);
+ GetStrVar(&TargetVarId,&Err);
GetStrVal(delimchars,&Err);
// 3rd arg (optional)
if (CheckParameterGiven()) {
@@ -5088,7 +5088,7 @@
return ErrSyntax;
char dest[MaxStrLen];
- strcpy_s(dest, sizeof(dest), StrVarPtr(VarId));
+ strcpy_s(dest, sizeof(dest), StrVarPtr(TargetVarId));
srcptr = dest;
srcptr[0] = '\0';
@@ -5097,6 +5097,7 @@
}
else {
for (i = 0 ; i < maxvar ; i++) {
+ TVarId VarId;
_snprintf_s(buf, sizeof(buf), _TRUNCATE, "groupmatchstr%d", i + 1);
if (CheckVar(buf,&VarType,&VarId)) {
if (VarType!=TypString)
@@ -5109,7 +5110,7 @@
}
}
}
- SetStrVal(VarId, dest);
+ SetStrVal(TargetVarId, dest);
return Err;
#undef MAXVARNUM