OSDN -- 開發和下載開源軟體
繁體中文翻譯狀態 translation status for zh-tw

[ttssh2-commit] [10741] setpassword マクロコマンドの、パスワードを渡す引数に文字列を指定できるようにした。

Back to archive index
scmno****@osdn***** scmno****@osdn*****
2023年 6月 7日 (水) 01:11:21 JST 

Revision: 10741
          https://osdn.net/projects/ttssh2/scm/svn/commits/10741
Author:   nmaya
Date:     2023-06-07 01:11:21 +0900 (Wed, 07 Jun 2023)
Log Message:
-----------
setpassword マクロコマンドの、パスワードを渡す引数に文字列を指定できるようにした。

文字列変数で渡さないと Syntax Error になっていた。

ticket #48169
Merge from 4-stable r10740

Revision Links:
--------------
    https://osdn.net/projects/ttssh2/scm/svn/commits/10740

Ticket Links:
------------
    https://osdn.net/projects/ttssh2/tracker/detail/48169

Modified Paths:
--------------
    trunk/doc/en/html/about/history.html
    trunk/doc/en/html/macro/command/setpassword.html
    trunk/doc/ja/html/about/history.html
    trunk/doc/ja/html/macro/command/setpassword.html
    trunk/teraterm/ttpmacro/ttl.cpp

-------------- next part --------------
Modified: trunk/doc/en/html/about/history.html
===================================================================
--- trunk/doc/en/html/about/history.html	2023-06-06 15:36:34 UTC (rev 10740)
+++ trunk/doc/en/html/about/history.html	2023-06-06 16:11:21 UTC (rev 10741)
@@ -79,6 +79,7 @@
       <li>Fixed current font name was empty in ChooseFont dialog when changing dialog fonts.</li>
       <li>Fixed the area selected with the mouse does not disappear when the text is erased with the erase escape sequences.</li>
       <li>Fixed DPI adjustment does not work correctly when VT Window is moved to different DPI monitor.</li>
+      <li>MACRO: The <a href="../macro/command/setpassword.html">setpassword</a> command cause an error when password argument is a string value. Only string variable was accepted.</li>
     </ul>
   </li>
 

Modified: trunk/doc/en/html/macro/command/setpassword.html
===================================================================
--- trunk/doc/en/html/macro/command/setpassword.html	2023-06-06 15:36:34 UTC (rev 10740)
+++ trunk/doc/en/html/macro/command/setpassword.html	2023-06-06 16:11:21 UTC (rev 10741)
@@ -20,7 +20,7 @@
 <h2>Format</h2>
 
 <pre class="macro-syntax">
-setpassword <filename> <password name> <strvar>
+setpassword <filename> <password name> <strval>
 </pre>
 
 <h2>Remarks</h2>
@@ -27,7 +27,7 @@
 
 <p>
 A password identified by <password name> from the password file <filename> is updated.<br>
-The string variable <strvar> 's password is encrypted and stored into the file.
+The string <strval> is encrypted and stored into the file.
 </p>
 
 <p>

Modified: trunk/doc/ja/html/about/history.html
===================================================================
--- trunk/doc/ja/html/about/history.html	2023-06-06 15:36:34 UTC (rev 10740)
+++ trunk/doc/ja/html/about/history.html	2023-06-06 16:11:21 UTC (rev 10741)
@@ -77,6 +77,7 @@
       <li>\x83_\x83C\x83A\x83\x8D\x83O\x83t\x83H\x83\x93\x83g\x95ύX\x8E\x9E\x81A\x83t\x83H\x83\x93\x83g\x91I\x91\xF0\x83_\x83C\x83A\x83\x8D\x83O\x82Ɍ\xBB\x8D݂̃t\x83H\x83\x93\x83g\x96\xBC\x82\xAA\x95\\x8E\xA6\x82\xB3\x82\xEA\x82Ȃ\xA2\x96\xE2\x91\xE8\x82\xF0\x8FC\x90\xB3\x82\xB5\x82\xBD</li>
       <li>\x8F\xC1\x8B\x8E\x83V\x81[\x83P\x83\x93\x83X\x82ŕ\xB6\x8E\x9A\x82\xAA\x8F\xC1\x82\xB3\x82ꂽ\x82Ƃ\xAB\x81A\x83}\x83E\x83X\x82őI\x91\xF0\x82\xB5\x82\xBD\x97̈悪\x8F\xC1\x82\xA6\x82Ȃ\xA2\x82悤\x82ɏC\x90\xB3\x82\xB5\x82\xBD</li>
       <li>VT \x83E\x83B\x83\x93\x83h\x83E\x82\xAA\x88قȂ郂\x83j\x83^\x82\xF0\x82܂\xBD\x82\xAE\x8E\x9E\x81ADPI\x92\xB2\x90\xAE\x82\xAA\x82\xA4\x82܂\xAD\x8Ds\x82\xED\x82\xEA\x82Ȃ\xA2\x96\xE2\x91\xE8\x82\xF0\x8FC\x90\xB3\x82\xB5\x82\xBD</li>
+      <li><a href="../macro/command/setpassword.html">setpassword</a> \x83}\x83N\x83\x8D\x83R\x83}\x83\x93\x83h\x82ŁA\x83p\x83X\x83\x8F\x81[\x83h\x82𕶎\x9A\x97\xF1\x82œn\x82\xB7\x82\xC6 Syntax Error \x82ɂȂ\xE9\x96\xE2\x91\xE8\x82\xF0\x8FC\x90\xB3\x82\xB5\x82\xBD\x81B\x95\xB6\x8E\x9A\x97\xF1\x95ϐ\x94\x82œn\x82\xB3\x82Ȃ\xA2\x82Ǝ󂯕t\x82\xAF\x82Ȃ\xA9\x82\xC1\x82\xBD\x81B</li>
     </ul>
   </li>
 

Modified: trunk/doc/ja/html/macro/command/setpassword.html
===================================================================
--- trunk/doc/ja/html/macro/command/setpassword.html	2023-06-06 15:36:34 UTC (rev 10740)
+++ trunk/doc/ja/html/macro/command/setpassword.html	2023-06-06 16:11:21 UTC (rev 10741)
@@ -20,14 +20,14 @@
 <h2>\x8C`\x8E\xAE</h2>
 
 <pre class="macro-syntax">
-setpassword <filename> <password name> <strvar>
+setpassword <filename> <password name> <strval>
 </pre>
 
 <h2>\x89\xF0\x90\xE0</h2>
 
 <p>
-\x83p\x83X\x83\x8F\x81[\x83h\x83t\x83@\x83C\x83\x8B <filename> \x82\xA9\x82\xE7 <password name> \x82Ŏw\x92肳\x82\xEA\x82\xE9\x83p\x83X\x83\x8F\x81[\x83h\x82\xF0 <strvar> \x82ɍX\x90V\x82\xB7\x82\xE9\x81B<br>
-\x95\xB6\x8E\x9A\x97\xF1\x95ϐ\x94  <strvar> \x82̃p\x83X\x83\x8F\x81[\x83h\x82͈Í\x86\x89\xBB\x82\xB3\x82\xEA\x81A\x83t\x83@\x83C\x83\x8B\x82ɕۑ\xB6\x82\xB3\x82\xEA\x82\xE9\x81B
+\x83p\x83X\x83\x8F\x81[\x83h\x83t\x83@\x83C\x83\x8B <filename> \x82̒\x86\x82\xCC <password name> \x82Ŏ\xAF\x95ʂ\xB3\x82\xEA\x82\xE9\x83p\x83X\x83\x8F\x81[\x83h\x82\xF0 <strval> \x82ɍX\x90V\x82\xB7\x82\xE9\x81B<br>
+\x95\xB6\x8E\x9A\x97\xF1 <strvar> \x82͈Í\x86\x89\xBB\x82\xB3\x82\xEA\x82ăt\x83@\x83C\x83\x8B\x82ɕۑ\xB6\x82\xB3\x82\xEA\x82\xE9\x81B
 </p>
 
 <p>

Modified: trunk/teraterm/ttpmacro/ttl.cpp
===================================================================
--- trunk/teraterm/ttpmacro/ttl.cpp	2023-06-06 15:36:34 UTC (rev 10740)
+++ trunk/teraterm/ttpmacro/ttl.cpp	2023-06-06 16:11:21 UTC (rev 10741)
@@ -2524,18 +2524,15 @@
 // setpassword 'password.dat' 'mypassword' passowrd
 WORD TTLSetPassword()
 {
-	TStrVal FileNameStr, KeyStr;
+	TStrVal FileNameStr, KeyStr, PassStr;
 	char Temp[512];
 	WORD Err;
-	TVarId VarId;
-	const char *VarStr;
 	int result = 0;  /* failure */
 
 	Err = 0;
 	GetStrVal(FileNameStr, &Err);   // \x83t\x83@\x83C\x83\x8B\x96\xBC
 	GetStrVal(KeyStr, &Err);  // \x83L\x81[\x96\xBC
-	GetStrVar(&VarId, &Err);
-	VarStr = StrVarPtr(VarId);  // \x95ϐ\x94\x82ւ̃|\x83C\x83\x93\x83^
+	GetStrVal(PassStr, &Err);  // \x83p\x83X\x83\x8F\x81[\x83h
 	if ((Err==0) && (GetFirstChar()!=0))
 		Err = ErrSyntax;
 	if (Err!=0) return Err;
@@ -2543,7 +2540,7 @@
 	// \x95\xB6\x8E\x9A\x97񂪋\xF3\x82̏ꍇ\x82̓G\x83\x89\x81[\x82Ƃ\xB7\x82\xE9\x81B
 	if (FileNameStr[0]==0 ||
 	    KeyStr[0]==0 ||
-	    VarStr[0]==0)   // "getpassword"\x93\xAF\x97l\x81A\x8B\xF3\x83p\x83X\x83\x8F\x81[\x83h\x82\xE0\x8B\x96\x89‚\xB5\x82Ȃ\xA2\x81B
+	    PassStr[0]==0)   // "getpassword"\x93\xAF\x97l\x81A\x8B\xF3\x83p\x83X\x83\x8F\x81[\x83h\x82\xE0\x8B\x96\x89‚\xB5\x82Ȃ\xA2\x81B
 		Err = ErrSyntax;
 	if (Err!=0) return Err;
 
@@ -2550,7 +2547,7 @@
 	GetAbsPath(FileNameStr, sizeof(FileNameStr));
 
 	// \x83p\x83X\x83\x8F\x81[\x83h\x82\xF0\x88Í\x86\x89\xBB\x82\xB7\x82\xE9\x81B
-	Encrypt(VarStr, Temp);
+	Encrypt(PassStr, Temp);
 
 	if (WritePrivateProfileString("Password", KeyStr, Temp, FileNameStr) != 0)
 		result = 1;  /* success */

ttssh2-commit メーリングリストの案内
Back to archive index