svnno****@sourc*****
svnno****@sourc*****
2010年 8月 21日 (土) 00:14:09 JST
Tera TermRevision: 4025
http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=4025
Author: maya
Date: 2010-08-21 00:14:09 +0900 (Sat, 21 Aug 2010)
Log Message:
-----------
strsplit ã®ç¬¬ä¸€å¼•æ•°ã¯å¤‰æ•°ã§ãªãã¦ã‚‚よã„(値を返ã•ãªã„)ã®ã§æ–‡å—列ã§ã‚‚å—ã‘付ã‘るよã†ã«ã—ãŸ
Modified Paths:
--------------
trunk/doc/en/html/macro/command/strsplit.html
trunk/doc/ja/html/macro/command/strsplit.html
trunk/teraterm/ttpmacro/ttl.c
-------------- next part --------------
Modified: trunk/doc/en/html/macro/command/strsplit.html
===================================================================
--- trunk/doc/en/html/macro/command/strsplit.html 2010-08-19 08:41:25 UTC (rev 4024)
+++ trunk/doc/en/html/macro/command/strsplit.html 2010-08-20 15:14:09 UTC (rev 4025)
@@ -20,13 +20,13 @@
<h2>Format</h2>
<pre class="macro-syntax">
-strsplit <strvar> <separator> <count> [<special>]
+strsplit <strval> <separator> <count> [<special>]
</pre>
<h2>Remarks</h2>
<p>
-Splits the string variable <strvar> by the <separator> delimiter, and returns the 9 system variables from "groupmatchstr1" to "groupmatchstr9".
+Splits the string <strval> by the <separator> delimiter, and returns the 9 system variables from "groupmatchstr1" to "groupmatchstr9".
</p>
<!--p>
Modified: trunk/doc/ja/html/macro/command/strsplit.html
===================================================================
--- trunk/doc/ja/html/macro/command/strsplit.html 2010-08-19 08:41:25 UTC (rev 4024)
+++ trunk/doc/ja/html/macro/command/strsplit.html 2010-08-20 15:14:09 UTC (rev 4025)
@@ -20,13 +20,13 @@
<h2>Œ`Ž®</h2>
<pre class="macro-syntax">
-strsplit <strvar> <separator> <count> [<special>]
+strsplit <strval> <separator> <count> [<special>]
</pre>
<h2>‰ðà</h2>
<p>
-•¶Žš—ñ•Ï” <strvar> ‚©‚çA‹æØ‚è‹L† <separator> ‚Å‹æØ‚ç‚ꂽ•”•ª•¶Žš—ñ‚ðŽæ‚èo‚µ‚ÄAgroupmatchstr1`groupmatchstr9‚É•Ô‚·B
+•¶Žš—ñ <strval> ‚©‚çA‹æØ‚è‹L† <separator> ‚Å‹æØ‚ç‚ꂽ•”•ª•¶Žš—ñ‚ðŽæ‚èo‚µ‚ÄAgroupmatchstr1`groupmatchstr9‚É•Ô‚·B
</p>
<p>
Modified: trunk/teraterm/ttpmacro/ttl.c
===================================================================
--- trunk/teraterm/ttpmacro/ttl.c 2010-08-19 08:41:25 UTC (rev 4024)
+++ trunk/teraterm/ttpmacro/ttl.c 2010-08-20 15:14:09 UTC (rev 4025)
@@ -3627,16 +3627,16 @@
WORD TTLStrSplit()
{
#define MAXVARNUM 9
- TStrVal delimchars, buf;
- WORD Err, VarId;
+ TStrVal src, delimchars, buf;
+ WORD Err;
int maxvar, sp;
int srclen, len;
int i;
- char *srcptr, *p;
+ char *p;
char *last, *tok[MAXVARNUM];
Err = 0;
- GetStrVar(&VarId,&Err);
+ GetStrVal(src,&Err);
GetStrVal(delimchars,&Err);
GetIntVal(&maxvar,&Err);
// get 3rd arg(optional) if given
@@ -3663,9 +3663,8 @@
if (len != 1)
return ErrSyntax;
- srcptr = StrVarPtr(VarId);
- srclen = strlen(srcptr);
- strcpy_s(buf, MaxStrLen, srcptr); /* strtok‚Å”j‰ó‚³‚ê‚Ä‚à‚¢‚¢‚悤‚ÉAƒRƒs[ƒoƒbƒtƒ@‚ðŽg‚¤B*/
+ srclen = strlen(src);
+ strcpy_s(buf, MaxStrLen, src); /* strtok‚Å”j‰ó‚³‚ê‚Ä‚à‚¢‚¢‚悤‚ÉAƒRƒs[ƒoƒbƒtƒ@‚ðŽg‚¤B*/
// ƒg[ƒNƒ“‚ÌØ‚èo‚µ‚ðs‚¤B
memset(tok, 0, sizeof(tok));