[Ttssh2-commit] [4974] ファイル名を扱うマクロコマンドで、相対パスの基準が起動条件によって変わる問題を修正。

svnno****@sourc***** svnno****@sourc*****
2012年 8月 9日 (木) 00:24:35 JST


Revision: 4974
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/4974
Author:   maya
Date:     2012-08-09 00:24:35 +0900 (Thu, 09 Aug 2012)
Log Message:
-----------
ファイル名を扱うマクロコマンドで、相対パスの基準が起動条件によって変わる問題を修正。
  http://sourceforge.jp/forum/message.php?msg_id=64850

Modified Paths:
--------------
    trunk/doc/en/html/about/history.html
    trunk/doc/ja/html/about/history.html
    trunk/teraterm/ttpmacro/ttmlib.c

-------------- next part --------------
Modified: trunk/doc/en/html/about/history.html
===================================================================
--- trunk/doc/en/html/about/history.html	2012-08-06 10:41:42 UTC (rev 4973)
+++ trunk/doc/en/html/about/history.html	2012-08-08 15:24:35 UTC (rev 4974)
@@ -50,6 +50,10 @@
       <li>COM port: The default setting can not be saved in the teraterm.ini file.</li>
       <li>Macro command: The send and sendln can not transmit a character #01.</li>
       <li>YMODEM: When the receiving a file is temporarily stopped, Tera Term can not send a NAK after timeout. So, the transfering can not be continued.</li>
+      <!--li>\x83t\x83@\x83C\x83\x8B\x82\xF0\x88\xB5\x82\xA4\x83}\x83N\x83\x8D\x83R\x83}\x83\x93\x83h\x82ŁA\x91\x8A\x91΃p\x83X\x82𐳂\xB5\x82\xAD\x89\xF0\x90͂\xB5\x82Ȃ\xA2\x82\xB1\x82Ƃ\xAA\x82\xA0\x82\xE9\x96\xE2\x91\xE8\x82\xF0\x8FC\x90\xB3\x82\xB5\x82\xBD\x81B
+        <ul>
+          <li>\x91\x8A\x91΃p\x83X\x82̊\x82\xAA\x81A\x83}\x83N\x83\x8D\x83t\x83@\x83C\x83\x8B\x82ɂȂ\xE9\x8Fꍇ\x82\xC6 teraterm \x83f\x83B\x83\x8C\x83N\x83g\x83\x8A\x82ɂȂ\xE9\x8Fꍇ\x82\xAA\x82\xA0\x82\xC1\x82\xBD\x81B\x82\xB1\x82̏C\x90\xB3\x82Ń}\x83N\x83\x8D\x83t\x83@\x83C\x83\x8B\x82\xF0\x8A\x82ɂ\xB7\x82\xE9\x82悤\x82ɂ\xB5\x82\xBD\x81B</li>
+        </ul></li-->
     </ul>
   </li>
 

Modified: trunk/doc/ja/html/about/history.html
===================================================================
--- trunk/doc/ja/html/about/history.html	2012-08-06 10:41:42 UTC (rev 4973)
+++ trunk/doc/ja/html/about/history.html	2012-08-08 15:24:35 UTC (rev 4974)
@@ -50,6 +50,10 @@
       <li>COM\x83|\x81[\x83g\x82\xF0\x83f\x83t\x83H\x83\x8B\x83g\x90ݒ\xE8\x82ŕۑ\xB6\x82ł\xAB\x82Ȃ\xA2\x96\xE2\x91\xE8\x82\xF0\x8FC\x90\xB3\x82\xB5\x82\xBD\x81B</li>
       <li>\x83}\x83N\x83\x8D\x83R\x83}\x83\x93\x83h send, sendln \x82ŁA0x01 \x82\xF0\x8A܂ޕ\xB6\x8E\x9A\x97\xF1\x82𐳂\xB5\x82\xAD\x91\x97\x82\xEA\x82Ȃ\xA2\x96\xE2\x91\xE8\x82\xF0\x8FC\x90\xB3\x82\xB5\x82\xBD\x81B</li>
       <li>YMODEM: \x8E\xF3\x90M\x92\x86\x82Ɉꎞ\x92\xE2\x8E~\x82\xB5\x82\xBD\x8Fꍇ\x81A\x83^\x83C\x83\x80\x83A\x83E\x83g\x82\xC5NAK\x82𑗐M\x82\xB5\x82Ă\xA2\x82Ȃ\xA2\x82\xBD\x82߁A\x8Dđ\x97\x82ł\xAB\x82Ă\xA2\x82Ȃ\xA9\x82\xC1\x82\xBD\x96\xE2\x91\xE8\x82\xF0\x8FC\x90\xB3\x82\xB5\x82\xBD\x81B</li>
+      <li>\x83t\x83@\x83C\x83\x8B\x82\xF0\x88\xB5\x82\xA4\x83}\x83N\x83\x8D\x83R\x83}\x83\x93\x83h\x82ŁA\x91\x8A\x91΃p\x83X\x82𐳂\xB5\x82\xAD\x89\xF0\x90͂\xB5\x82Ȃ\xA2\x82\xB1\x82Ƃ\xAA\x82\xA0\x82\xE9\x96\xE2\x91\xE8\x82\xF0\x8FC\x90\xB3\x82\xB5\x82\xBD\x81B
+        <ul>
+          <li>\x91\x8A\x91΃p\x83X\x82̊\x82\xAA\x81A\x83}\x83N\x83\x8D\x83t\x83@\x83C\x83\x8B\x82ɂȂ\xE9\x8Fꍇ\x82\xC6 teraterm \x83f\x83B\x83\x8C\x83N\x83g\x83\x8A\x82ɂȂ\xE9\x8Fꍇ\x82\xAA\x82\xA0\x82\xC1\x82\xBD\x81B\x82\xB1\x82̏C\x90\xB3\x82Ń}\x83N\x83\x8D\x83t\x83@\x83C\x83\x8B\x82\xF0\x8A\x82ɂ\xB7\x82\xE9\x82悤\x82ɂ\xB5\x82\xBD\x81B</li>
+        </ul></li>
     </ul>
   </li>
 

Modified: trunk/teraterm/ttpmacro/ttmlib.c
===================================================================
--- trunk/teraterm/ttpmacro/ttmlib.c	2012-08-06 10:41:42 UTC (rev 4973)
+++ trunk/teraterm/ttpmacro/ttmlib.c	2012-08-08 15:24:35 UTC (rev 4974)
@@ -76,9 +76,15 @@
   if (! GetFileNamePos(FName,&i,&j)) {
     return FALSE;
   }
-  else if (i>0) {
+  if (strlen(FName) > 2 && FName[1] == ':') {
+    // fullpath
     return TRUE;
   }
+  else if (FName[0] == '\\') {
+    // UNC (\\server\path)
+    // from drive root (\foo\bar)
+    return TRUE;
+  }
   strncpy_s(Temp, sizeof(Temp), FName, _TRUNCATE);
   strncpy_s(FName,destlen,CurrentDir,_TRUNCATE);
   AppendSlash(FName,destlen);



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