[Ttssh2-commit] [6897] sendlnbroadcast / sendlnmulticast の動作を sendln にあわせた

svnno****@sourc***** svnno****@sourc*****
2017年 8月 17日 (木) 21:54:42 JST


Revision: 6897
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/6897
Author:   doda
Date:     2017-08-17 21:54:42 +0900 (Thu, 17 Aug 2017)
Log Message:
-----------
sendlnbroadcast / sendlnmulticast の動作を sendln にあわせた
Ticket: #37413 [Ttssh2-devel 3328]

・改行を "\r\n" に変更。
・改行を最後のパラメータの後ろのみに付加するよう変更

Ticket Links:
------------
    http://sourceforge.jp/projects/ttssh2/tracker/detail/37413

Modified Paths:
--------------
    trunk/doc/en/html/about/history.html
    trunk/doc/ja/html/about/history.html
    trunk/teraterm/ttpmacro/ttl.c

-------------- next part --------------
Modified: trunk/doc/en/html/about/history.html
===================================================================
--- trunk/doc/en/html/about/history.html	2017-08-17 12:54:37 UTC (rev 6896)
+++ trunk/doc/en/html/about/history.html	2017-08-17 12:54:42 UTC (rev 6897)
@@ -49,6 +49,7 @@
         <ul>
           <li><a href="../menu/setup-additional.html#ListHiddenFonts">Additional settings\x83_\x83C\x83A\x83\x8D\x83O</a>\x82\xCC General \x83^\x83u\x82Őݒ\xE8\x82\xF0\x97L\x8C\xF8\x89\xBB\x82ł\xAB\x82\xE9\x82悤\x82ɂ\xB5\x82\xBD\x81B</li>
         </ul></li -->
+      <!-- li><a href="../macro/command/sendlnbroadcast.html">sendlnbroadcast</a> \x83}\x83N\x83\x8D\x83R\x83}\x83\x93\x83h\x82ŁA\x89\xFC\x8Ds\x82𑗐M\x82\xB7\x82\xE9\x82̂\xF0\x8DŌ\xE3\x82̃p\x83\x89\x83\x81\x81[\x83^\x82̌\xE3\x82̈\xEA\x89񂾂\xAF\x82ɕύX\x82\xB5\x82\xBD\x81B</li -->
       <li>added the <a href="../macro/command/sendlnmulticast.html">sendlnmulticast</a> command.</li>
     </ul>
   </li>

Modified: trunk/doc/ja/html/about/history.html
===================================================================
--- trunk/doc/ja/html/about/history.html	2017-08-17 12:54:37 UTC (rev 6896)
+++ trunk/doc/ja/html/about/history.html	2017-08-17 12:54:42 UTC (rev 6897)
@@ -49,6 +49,7 @@
         <ul>
           <li><a href="../menu/setup-additional.html#ListHiddenFonts">Additional settings\x83_\x83C\x83A\x83\x8D\x83O</a>\x82\xCC General \x83^\x83u\x82Őݒ\xE8\x82\xF0\x97L\x8C\xF8\x89\xBB\x82ł\xAB\x82\xE9\x82悤\x82ɂ\xB5\x82\xBD\x81B</li>
         </ul></li>
+      <li><a href="../macro/command/sendlnbroadcast.html">sendlnbroadcast</a> \x83}\x83N\x83\x8D\x83R\x83}\x83\x93\x83h\x82ŁA\x89\xFC\x8Ds\x82𑗐M\x82\xB7\x82\xE9\x82̂\xF0\x8DŌ\xE3\x82̃p\x83\x89\x83\x81\x81[\x83^\x82̌\xE3\x82̈\xEA\x89񂾂\xAF\x82ɕύX\x82\xB5\x82\xBD\x81B</li>
       <li><a href="../macro/command/sendlnmulticast.html">sendlnmulticast</a> \x83}\x83N\x83\x8D\x83R\x83}\x83\x93\x83h\x82\xF0\x92lj\xC1\x82\xB5\x82\xBD\x81B</li>
     </ul>
   </li>

Modified: trunk/teraterm/ttpmacro/ttl.c
===================================================================
--- trunk/teraterm/ttpmacro/ttl.c	2017-08-17 12:54:37 UTC (rev 6896)
+++ trunk/teraterm/ttpmacro/ttl.c	2017-08-17 12:54:42 UTC (rev 6897)
@@ -4064,19 +4064,10 @@
 		else {
 			break;
 		}
-		if (crlf) {
-			/*
-			 * \x8C\x9F\x93\xA2\x8E\x96\x8D\x80:
-			 *
-			 * 1. crlf \x82\xAA TRUE \x8E\x9E\x82ɑ\x97\x82\xE9\x82̂\xAA "\n" \x82Ȃ̂͑Ó\x96?
-			 *    sendln \x82ł\xCD 0x0A 0x0D ("\r\n") \x82𑗂\xC1\x82Ă\xA2\x82\xE9
-			 *
-			 * 2. \x83p\x83\x89\x83\x81\x81[\x83^\x88\xEA\x82–\x88\x82ɉ\xFC\x8Ds\x82\xB5\x82Ă\xA2\x82\xE9\x82̂͑Ó\x96?
-			 *    sendln \x82ł͂\xB7\x82ׂẴp\x83\x89\x83\x81\x81[\x83^\x82𑗂\xC1\x82\xBD\x8C\xE3\x82ɉ\xFC\x8Ds\x82\xB5\x82Ă\xA2\x82\xE9
-			 */
-			strncat_s(buff, bufflen, "\n", _TRUNCATE);
-		}
 	}
+	if (crlf) {
+		strncat_s(buff, bufflen, "\r\n", _TRUNCATE);
+	}
 	return 0;
 }
 



Ttssh2-commit メーリングリストの案内