[Ttssh2-commit] [5167] getipv4addr, getipv6addr マクロコマンドの引数に、文字型配列そのものを

svnno****@sourc***** svnno****@sourc*****
2013年 3月 23日 (土) 20:31:16 JST


Revision: 5167
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/5167
Author:   yutakapon
Date:     2013-03-23 20:31:16 +0900 (Sat, 23 Mar 2013)
Log Message:
-----------
getipv4addr, getipv6addr マクロコマンドの引数に、文字型配列そのものを
指定できるようにした。

Modified Paths:
--------------
    trunk/doc/en/html/macro/command/getipv4addr.html
    trunk/doc/en/html/macro/command/getipv6addr.html
    trunk/doc/ja/html/macro/command/getipv4addr.html
    trunk/doc/ja/html/macro/command/getipv6addr.html
    trunk/teraterm/ttpmacro/ttl.c

-------------- next part --------------
Modified: trunk/doc/en/html/macro/command/getipv4addr.html
===================================================================
--- trunk/doc/en/html/macro/command/getipv4addr.html	2013-03-23 11:04:58 UTC (rev 5166)
+++ trunk/doc/en/html/macro/command/getipv4addr.html	2013-03-23 11:31:16 UTC (rev 5167)
@@ -18,14 +18,14 @@
 </p>
 
 <pre class="macro-syntax">
-getipv4addr &lt;string array[0]&gt;
+getipv4addr &lt;string array&gt;
 </pre>
 
 <h2>Parameters</h2>
 
 <dl>
-	<dt class="macro">Array &lt;string array[0]&gt;</dt>
-	<dd>IP addresses are stored in the string array. The max items is 10.</dd>
+	<dt class="macro">Array &lt;string array&gt;</dt>
+	<dd>IP addresses are stored in the string array.</dd>
 </dl>
 
 <h2>Return Value</h2>
@@ -42,7 +42,7 @@
 <pre class="macro-example">
 strdim ipaddr 10
 
-getipv4addr ipaddr[0]
+getipv4addr ipaddr
 N = result - 1
 for i 0 N
 	messagebox ipaddr[i] "IPv4 address"

Modified: trunk/doc/en/html/macro/command/getipv6addr.html
===================================================================
--- trunk/doc/en/html/macro/command/getipv6addr.html	2013-03-23 11:04:58 UTC (rev 5166)
+++ trunk/doc/en/html/macro/command/getipv6addr.html	2013-03-23 11:31:16 UTC (rev 5167)
@@ -18,14 +18,14 @@
 </p>
 
 <pre class="macro-syntax">
-getipv6addr &lt;string array[0]&gt;
+getipv6addr &lt;string array&gt;
 </pre>
 
 <h2>Parameters</h2>
 
 <dl>
-	<dt class="macro">Array &lt;string array[0]&gt;</dt>
-	<dd>IP addresses are stored in the string array. The max items is 10.</dd>
+	<dt class="macro">Array &lt;string array&gt;</dt>
+	<dd>IP addresses are stored in the string array.</dd>
 </dl>
 
 <h2>Return Value</h2>
@@ -42,7 +42,7 @@
 <pre class="macro-example">
 strdim ipaddr 10
 
-getipv6addr ipaddr[0]
+getipv6addr ipaddr
 N = result - 1
 for i 0 N
 	messagebox ipaddr[i] "IPv6 address"

Modified: trunk/doc/ja/html/macro/command/getipv4addr.html
===================================================================
--- trunk/doc/ja/html/macro/command/getipv4addr.html	2013-03-23 11:04:58 UTC (rev 5166)
+++ trunk/doc/ja/html/macro/command/getipv4addr.html	2013-03-23 11:31:16 UTC (rev 5167)
@@ -18,14 +18,14 @@
 </p>
 
 <pre class="macro-syntax">
-getipv4addr &lt;string array[0]&gt;
+getipv4addr &lt;string array&gt;
 </pre>
 
 <h2>\x83p\x83\x89\x83\x81\x81[\x83^</h2>
 
 <dl>
-	<dt class="macro">\x94z\x97\xF1 &lt;string array[0]&gt;</dt>
-	<dd>IP\x83A\x83h\x83\x8C\x83X\x82\xF0\x8Ai\x94[\x82\xB7\x82镶\x8E\x9A\x8C^\x94z\x97\xF1\x81B\x8Dő\xE510\x8C‚܂ŁB</dd>
+	<dt class="macro">\x94z\x97\xF1 &lt;string array&gt;</dt>
+	<dd>IP\x83A\x83h\x83\x8C\x83X\x82\xF0\x8Ai\x94[\x82\xB7\x82镶\x8E\x9A\x8C^\x94z\x97\xF1\x81B</dd>
 </dl>
 
 <h2>\x95Ԃ\xE8\x92l</h2>
@@ -42,7 +42,7 @@
 <pre class="macro-example">
 strdim ipaddr 10
 
-getipv4addr ipaddr[0]
+getipv4addr ipaddr
 N = result - 1
 for i 0 N
 	messagebox ipaddr[i] "IPv4 address"

Modified: trunk/doc/ja/html/macro/command/getipv6addr.html
===================================================================
--- trunk/doc/ja/html/macro/command/getipv6addr.html	2013-03-23 11:04:58 UTC (rev 5166)
+++ trunk/doc/ja/html/macro/command/getipv6addr.html	2013-03-23 11:31:16 UTC (rev 5167)
@@ -18,14 +18,14 @@
 </p>
 
 <pre class="macro-syntax">
-getipv6addr &lt;string array[0]&gt;
+getipv6addr &lt;string array&gt;
 </pre>
 
 <h2>\x83p\x83\x89\x83\x81\x81[\x83^</h2>
 
 <dl>
-	<dt class="macro">\x94z\x97\xF1 &lt;string array[0]&gt;</dt>
-	<dd>IP\x83A\x83h\x83\x8C\x83X\x82\xF0\x8Ai\x94[\x82\xB7\x82镶\x8E\x9A\x8C^\x94z\x97\xF1\x81B\x8Dő\xE510\x8C‚܂ŁB</dd>
+	<dt class="macro">\x94z\x97\xF1 &lt;string array&gt;</dt>
+	<dd>IP\x83A\x83h\x83\x8C\x83X\x82\xF0\x8Ai\x94[\x82\xB7\x82镶\x8E\x9A\x8C^\x94z\x97\xF1\x81B</dd>
 </dl>
 
 <h2>\x95Ԃ\xE8\x92l</h2>
@@ -42,7 +42,7 @@
 <pre class="macro-example">
 strdim ipaddr 10
 
-getipv6addr ipaddr[0]
+getipv6addr ipaddr
 N = result - 1
 for i 0 N
 	messagebox ipaddr[i] "IPv6 address"

Modified: trunk/teraterm/ttpmacro/ttl.c
===================================================================
--- trunk/teraterm/ttpmacro/ttl.c	2013-03-23 11:04:58 UTC (rev 5166)
+++ trunk/teraterm/ttpmacro/ttl.c	2013-03-23 11:31:16 UTC (rev 5167)
@@ -2170,10 +2170,10 @@
 	return Err;
 }
 
-#define MAX_IPADDR 10
+#define MAX_IPADDR 30
 /*
  strdim ipaddr 10
- getipv4addr ipaddr[0]
+ getipv4addr ipaddr
  result = N
  */
 WORD TTLGetIPv4Addr()
@@ -2189,7 +2189,7 @@
 	IN_ADDR addr;
 
 	Err = 0;
-	GetStrVar(&VarId,&Err);
+	GetStrAryVar(&VarId,&Err);
 	if ((Err==0) && (GetFirstChar()!=0))
 		Err = ErrSyntax;
 	if (Err!=0) return Err;
@@ -2210,7 +2210,7 @@
 				continue;
 			addr = info[i].iiAddress.AddressIn.sin_addr;
 
-			id = GetStrVarFromArray(GetArrayVarId(VarId), num, &Err);
+			id = GetStrVarFromArray(VarId, num, &Err);
 			if (Err == 0) {
 				SetStrVal(id, inet_ntoa(addr));
 				num++;
@@ -2265,7 +2265,7 @@
 	pGetAdaptersAddresses pfunc;
 
 	Err = 0;
-	GetStrVar(&VarId,&Err);
+	GetStrAryVar(&VarId,&Err);
 	if ((Err==0) && (GetFirstChar()!=0))
 		Err = ErrSyntax;
 	if (Err!=0) return Err;
@@ -2302,7 +2302,7 @@
 				sa = (struct sockaddr_in6*)addr.lpSockaddr;
 				myInetNtop(AF_INET6, (char*)&sa->sin6_addr, ipv6str, sizeof(ipv6str));
 
-				id = GetStrVarFromArray(GetArrayVarId(VarId), num, &Err);
+				id = GetStrVarFromArray(VarId, num, &Err);
 				if (Err == 0) {
 					SetStrVal(id, ipv6str);
 					num++;



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