svnno****@sourc*****
svnno****@sourc*****
2012年 2月 17日 (金) 22:44:17 JST
Tera TermRevision: 4841
http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=4841
Author: maya
Date: 2012-02-17 22:44:16 +0900 (Fri, 17 Feb 2012)
Log Message:
-----------
filedelete マクロコマンドで remove() の返り値を見て result に反映していない問題を修正
http://sourceforge.jp/ticket/browse.php?group_id=1412&tid=27562
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 2012-02-07 15:27:59 UTC (rev 4840)
+++ trunk/doc/en/html/about/history.html 2012-02-17 13:44:16 UTC (rev 4841)
@@ -70,6 +70,7 @@
<li>"<a href="../macro/command/filerename.html">filerename</a>" macro command: When a file can not be renamed, the error code stores to the result variable.</li>
<li>The packet number will not be correct while sending a file by using the XMODEM and YMODEM protocol.</li>
<li>When a log is started, the log window is temporarily activated. However, this is enabled for Windows 2000 later.</li>
+ <li>"<a href="../macro/command/filedelete.html">filedelete</a>" macro command: When a file can not be removed, the error code stores to the result variable.</li>
</ul>
</li>
Modified: trunk/doc/ja/html/about/history.html
===================================================================
--- trunk/doc/ja/html/about/history.html 2012-02-07 15:27:59 UTC (rev 4840)
+++ trunk/doc/ja/html/about/history.html 2012-02-17 13:44:16 UTC (rev 4841)
@@ -70,6 +70,7 @@
<li>\x83}\x83N\x83\x8D\x83R\x83}\x83\x93\x83h "<a href="../macro/command/filerename.html">filerename</a>" \x82ɂ\xA8\x82\xA2\x82āA\x83\x8A\x83l\x81[\x83\x80\x82\xAA\x8E\xB8\x94s\x82\xB5\x82\xBD\x8Fꍇ\x81Aresult \x82ɃG\x83\x89\x81[\x82\xF0\x83Z\x83b\x83g\x82\xB7\x82\xE9\x82悤\x82ɂ\xB5\x82\xBD\x81B</li>
<li>XMODEM, YMODEM \x82ő\x97\x90M\x92\x86\x82ɕ\\x8E\xA6\x82\xB3\x82\xEA\x82\xE9\x83p\x83P\x83b\x83g\x94ԍ\x86\x82\xAA\x90\xB3\x82\xB5\x82\xAD\x82Ȃ\xA2\x8Fꍇ\x82\xAA\x82\xA0\x82\xE9\x96\xE2\x91\xE8\x82\xF0\x8FC\x90\xB3</li>
<li>\x83\x8D\x83O\x8E擾\x82\xF0\x8AJ\x8En\x82\xB5\x82\xBD\x82Ƃ\xAB\x81A\x83\x8D\x83O\x83E\x83B\x83\x93\x83h\x83E\x82\xAA\x88\xEA\x8Fu\x83A\x83N\x83e\x83B\x83u\x82ɂȂ铮\x8D\xEC\x82\xF0\x8FC\x90\xB3(\x91\xF4\x82\xCD Windows 2000 \x88ȍ~\x82ł̂ݗL\x8C\xF8)\x81B</li>
+ <li>\x83}\x83N\x83\x8D\x83R\x83}\x83\x93\x83h "<a href="../macro/command/filedelete.html">filedelete</a>" \x82ɂ\xA8\x82\xA2\x82āA\x8D폜\x82\xAA\x8E\xB8\x94s\x82\xB5\x82\xBD\x8Fꍇ\x81Aresult \x82ɃG\x83\x89\x81[\x82\xF0\x83Z\x83b\x83g\x82\xB7\x82\xE9\x82悤\x82ɂ\xB5\x82\xBD\x81B</li>
</ul>
</li>
Modified: trunk/teraterm/ttpmacro/ttl.c
===================================================================
--- trunk/teraterm/ttpmacro/ttl.c 2012-02-07 15:27:59 UTC (rev 4840)
+++ trunk/teraterm/ttpmacro/ttl.c 2012-02-17 13:44:16 UTC (rev 4841)
@@ -1196,9 +1196,14 @@
SetResult(-1);
return Err;
}
- remove(FName);
+
+ if (remove(FName) != 0) {
+ SetResult(-1);
+ }
+ else {
+ SetResult(0);
+ }
- SetResult(0);
return Err;
}