svnno****@sourc*****
svnno****@sourc*****
2013年 5月 24日 (金) 09:53:49 JST
Tera TermRevision: 5275
http://sourceforge.jp/projects/ttssh2/scm/svn/commits/5275
Author: doda
Date: 2013-05-24 09:53:48 +0900 (Fri, 24 May 2013)
Log Message:
-----------
wait/waitln で空文字列を待てるようにした。
http://sourceforge.jp/ticket/browse.php?group_id=1412&tid=31337
Modified Paths:
--------------
trunk/teraterm/ttpmacro/ttl.c
-------------- next part --------------
Modified: trunk/teraterm/ttpmacro/ttl.c
===================================================================
--- trunk/teraterm/ttpmacro/ttl.c 2013-05-22 11:08:19 UTC (rev 5274)
+++ trunk/teraterm/ttpmacro/ttl.c 2013-05-24 00:53:48 UTC (rev 5275)
@@ -5182,38 +5182,27 @@
WORD Err, ValType;
TVarId VarId;
int i, Val;
- BOOL NoMore;
int TimeOut;
ClearWait();
- i = 0;
- do {
+ for (i=0; i<10; i++) {
Err = 0;
- Str[0] = 0;
- NoMore = FALSE;
- if (! GetString(Str,&Err))
- {
- if (GetExpression(&ValType,&Val,&Err))
- {
- if (Err==0)
- {
- if (ValType==TypString)
- strncpy_s(Str, sizeof(Str),StrVarPtr((TVarId)Val), _TRUNCATE);
- else
- Err=ErrTypeMismatch;
- }
- }
+ if (GetString(Str, &Err)) {
+ SetWait(i+1, Str);
+ }
+ else if (GetExpression(&ValType, &Val, &Err) && Err == 0) {
+ if (ValType == TypString)
+ SetWait(i+1, StrVarPtr((TVarId)Val));
else
- NoMore = TRUE;
+ Err = ErrTypeMismatch;
}
+ else
+ break;
- if ((Err==0) && (strlen(Str)>0) && (i<10))
- {
- i++;
- SetWait(i,Str);
- }
- } while ((Err==0) && (i<10) && !NoMore);
+ if (Err)
+ break;
+ }
if ((Err==0) && (GetFirstChar()!=0))
Err = ErrSyntax;