提交: 223bb214b3f88b903ca1719befafcd1d6d7d612a - Tera_Term_Testing (git)

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

Commit MetaInfo

• 修订版: 223bb214b3f88b903ca1719befafcd1d6d7d612a (tree)
• 时间: 2020-04-12 00:57:03
• 作者: zmatsuo <zmatsuo@user...>
• Commiter: zmatsuo

Log Message

正規表現マクロコマンドを正しく動作するよう修正

- strreplace
- regexoption

- デフォルトを変更 ENCODING_ASCII -> ENCODING_UTF8

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

更改概述

• modified: teraterm/ttpmacro/ttl.cpp
• modified: teraterm/ttpmacro/ttmdde.c

差异

--- a/teraterm/ttpmacro/ttl.cpp
+++ b/teraterm/ttpmacro/ttl.cpp
@@ -4623,19 +4623,17 @@ WORD TTLStrRemove()
 WORD TTLStrReplace()
 {
 	WORD Err, VarType;
-	TVarId VarId;
+	TVarId DestVarId;
 	TStrVal oldstr;
 	TStrVal newstr;
 	TStrVal tmpstr;
-	const char *srcptr;
-	const char *matchptr;
 	char *p;
 	int srclen, oldlen, matchlen;
 	int pos, ret;
 	int result = 0;
 
 	Err = 0;
-	GetStrVar(&VarId,&Err);
+	GetStrVar(&DestVarId,&Err);
 	GetIntVal(&pos,&Err);
 	GetStrVal(oldstr,&Err);
 	GetStrVal(newstr,&Err);
@@ -4643,7 +4641,7 @@ WORD TTLStrReplace()
 		Err = ErrSyntax;
 	if (Err!=0) return Err;
 
-	srcptr = StrVarPtr(VarId);
+	const char *srcptr = StrVarPtr(DestVarId);
 	srclen = strlen(srcptr);
 
 	if (pos > srclen || pos <= 0) {
@@ -4673,9 +4671,10 @@ WORD TTLStrReplace()
 	}
 	ret--;
 
-	if (CheckVar("matchstr",&VarType,&VarId) &&
+	TVarId MatchVarId;
+	if (CheckVar("matchstr",&VarType,&MatchVarId) &&
 		(VarType==TypString)) {
-		matchptr = StrVarPtr(VarId);
+		const char *matchptr = StrVarPtr(MatchVarId);
 		matchlen = strlen(matchptr);
 	} else {
 		result = 0;
@@ -4686,7 +4685,7 @@ WORD TTLStrReplace()
 	strncpy_s(dest, sizeof(dest), tmpstr, pos + ret);
 	strncat_s(dest, sizeof(dest), newstr, _TRUNCATE);
 	strncat_s(dest, sizeof(dest), tmpstr + pos + ret + matchlen, _TRUNCATE);
-	SetStrVal(VarId, dest);
+	SetStrVal(DestVarId, dest);
 
 	result = 1;
 

--- a/teraterm/ttpmacro/ttmdde.c
+++ b/teraterm/ttpmacro/ttmdde.c
@@ -55,7 +55,7 @@ TStrVal Wait2Str;
 BOOL Wait2Found;
 
 OnigOptionType RegexOpt = ONIG_OPTION_NONE;
-OnigEncoding RegexEnc = ONIG_ENCODING_ASCII;
+OnigEncoding RegexEnc = ONIG_ENCODING_UTF8;
 OnigSyntaxType *RegexSyntax = ONIG_SYNTAX_RUBY;
 
 #define ServiceName "TERATERM"