Commit: a0d074e85642b7f90dde677e69e8a00f2caaa5db - Tera_Term_Testing (git)

Tera Termの個人的な作業用リポジトリ

Commit MetaInfo

• Revisión: a0d074e85642b7f90dde677e69e8a00f2caaa5db (tree)
• Tiempo: 2023-10-16 23:53:44
• Autor: zmatsuo <zmatsuo@user...>
• Commiter: zmatsuo

Log Message

マクロコマンド strjoin で連結文字列を設定する変数を誤っていたので修正

- 連結元の最後の変数に連結文字列を設定していた

ticket #48858

git-svn-id: svn+ssh://svn.osdn.net/svnroot/ttssh2/trunk@11009 f5f01b69-1e22-0410-acbf-894ab4bd6246

Cambiar Resumen

• modified: doc/en/html/about/history.html
• modified: doc/ja/html/about/history.html
• modified: teraterm/ttpmacro/ttl.cpp

Diferencia incremental

--- a/doc/en/html/about/history.html
+++ b/doc/en/html/about/history.html
@@ -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

--- a/doc/ja/html/about/history.html
+++ b/doc/ja/html/about/history.html
@@ -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>変更
+    <ul>
+    </ul>
+  </li -->
+
+  <li>バグ修正
+    <ul>
+      <li><a href="../macro/command/strjoin.html">strjoin</a> マクロコマンドで、連結文字列を誤った変数へセットしていた問題を修正した。</li>
+    </ul>
+  </li>
+
+  <!-- li>その他
+    <ul>
+    </ul>
+  </li -->
+</ul>
+
 <h3 id="teraterm_5.0">2023.10.15 (Ver 5.0)</h3>
 <ul class="history">
   <li>変更

--- a/teraterm/ttpmacro/ttl.cpp
+++ b/teraterm/ttpmacro/ttl.cpp
@@ -5046,12 +5046,12 @@ WORD TTLStrSplit()
 #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 @@ WORD TTLStrJoin()
 	const char *p;
 
 	Err = 0;
-	GetStrVar(&VarId,&Err);
+	GetStrVar(&TargetVarId,&Err);
 	GetStrVal(delimchars,&Err);
 	// 3rd arg (optional)
 	if (CheckParameterGiven()) {
@@ -5088,7 +5088,7 @@ WORD TTLStrJoin()
 		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 @@ WORD TTLStrJoin()
 	}
 	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 @@ WORD TTLStrJoin()
 			}
 		}
 	}
-	SetStrVal(VarId, dest);
+	SetStrVal(TargetVarId, dest);
 
 	return Err;
 #undef MAXVARNUM