svnno****@sourc*****
svnno****@sourc*****
2011年 12月 23日 (金) 00:29:31 JST
Tera TermRevision: 4781
http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=4781
Author: yutakapon
Date: 2011-12-23 00:29:31 +0900 (Fri, 23 Dec 2011)
Log Message:
-----------
filerename で、ファイルのリネームに失敗したら、正しくエラーを返すようにした。
http://logmett.com/forum/viewtopic.php?f=8&t=1861
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 2011-12-22 15:05:33 UTC (rev 4780)
+++ trunk/doc/en/html/about/history.html 2011-12-22 15:29:31 UTC (rev 4781)
@@ -49,11 +49,11 @@
</ul>
</li>
- <!-- li>Bug fixes
+ <li>Bug fixes
<ul>
- <li></li>
+ <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>
</ul>
- </li -->
+ </li>
<!-- li>Misc
<ul>
Modified: trunk/doc/ja/html/about/history.html
===================================================================
--- trunk/doc/ja/html/about/history.html 2011-12-22 15:05:33 UTC (rev 4780)
+++ trunk/doc/ja/html/about/history.html 2011-12-22 15:29:31 UTC (rev 4781)
@@ -49,11 +49,11 @@
</ul>
</li>
- <!-- li>\x83o\x83O\x8FC\x90\xB3
+ <li>\x83o\x83O\x8FC\x90\xB3
<ul>
- <li></li>
+ <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>
</ul>
- </li -->
+ </li>
<!-- li>\x82\xBB\x82̑\xBC
<ul>
Modified: trunk/teraterm/ttpmacro/ttl.c
===================================================================
--- trunk/teraterm/ttpmacro/ttl.c 2011-12-22 15:05:33 UTC (rev 4780)
+++ trunk/teraterm/ttpmacro/ttl.c 2011-12-22 15:29:31 UTC (rev 4781)
@@ -1437,7 +1437,11 @@
SetResult(-2);
return Err;
}
- rename(FName1,FName2);
+ if (rename(FName1,FName2) != 0) {
+ // \x83\x8A\x83l\x81[\x83\x80\x82Ɏ\xB8\x94s\x82\xB5\x82\xBD\x82\xE7\x81A\x83G\x83\x89\x81[\x82ŕԂ\xB7\x81B
+ SetResult(-3);
+ return Err;
+ }
SetResult(0);
return Err;