Tera Term

[ttssh2-commit] [9709] ログファイル名の処理を変更

• 前の記事 (スレッド) [ttssh2-commit] [9708] reference/keyboard_cfg.md を setup/keyboard.html にマージした
• 次の記事 (スレッド) [ttssh2-commit] [9710] 「My Documents に broadcast.log が存在する場合に使う」動作を削除
• 記事の並び順: [ 日付 ] [ スレッド ] [ 件名 ] [ 著者 ]

Revision: 9709
          https://osdn.net/projects/ttssh2/scm/svn/commits/9709
Author:   nmaya
Date:     2022-01-30 23:06:34 +0900 (Sun, 30 Jan 2022)
Log Message:
-----------
ログファイル名の処理を変更

#43507

- コマンドラインでフルパスでないログファイル名を指定した場合
フルパス化せず実行ファイルのあるディレクトリが基準になっていたのを、
LogDefaultPath, LogDir の順でフルパス化して開くようにした。

- LogAutoStart が on の場合
LogDefaultPath, FileDir, LogDir の順でフルパス化していたのを、
LogDefaultPath, LogDir の順でフルパス化して開くようにした。

- コマンドラインでログファイル名を指定した場合
デフォルトファイル名を使う場合と同様、ファイル名に Tera Term の置換・strftime の変換をかけるようにした。
https://ttssh2.osdn.jp/manual/4/ja/menu/setup-additional.html#LogDefaultName

Ticket Links:
------------
    https://osdn.net/projects/ttssh2/tracker/detail/43507

Modified Paths:
--------------
    trunk/doc/en/html/about/history.html
    trunk/doc/en/html/commandline/teraterm.html
    trunk/doc/en/html/menu/setup-additional-log.html
    trunk/doc/ja/html/about/history.html
    trunk/doc/ja/html/commandline/teraterm.html
    trunk/doc/ja/html/menu/setup-additional-log.html
    trunk/teraterm/teraterm/filesys_log.cpp
    trunk/teraterm/teraterm/vtwin.cpp

-------------- next part --------------
Modified: trunk/doc/en/html/about/history.html
===================================================================
--- trunk/doc/en/html/about/history.html	2022-01-29 16:49:55 UTC (rev 9708)
+++ trunk/doc/en/html/about/history.html	2022-01-30 14:06:34 UTC (rev 9709)
@@ -40,6 +40,10 @@
       <ul>
         <li>Same behavior as before the change when DPIAware=off add to Tera Term section in TERATERM.INI</li>
       </ul>
+<!--
+      <li>\x83R\x83}\x83\x93\x83h\x83\x89\x83C\x83\x93\x82Ŏw\x92肳\x82ꂽ\x83\x8D\x83O\x83t\x83@\x83C\x83\x8B\x96\xBC\x82\xF0\x81A<a href="../menu/setup-additional-log.html#LogDefaultName">\x95W\x8F\x80\x82̃\x8D\x83O\x83t\x83@\x83C\x83\x8B\x96\xBC</a>\x82Ɠ\xAF\x82\xB6\x82悤\x82\xC9<a href="../menu/setup-additional-log.html#LogFileNameFormat">\x92u\x8A\xB7\x82\xB7\x82\xE9</a>\x82悤\x82ɂ\xB5\x82\xBD\x81B</li>
+      <li>\x83R\x83}\x83\x93\x83h\x83\x89\x83C\x83\x93\x82Ŏw\x92肳\x82ꂽ\x83\x8D\x83O\x83t\x83@\x83C\x83\x8B\x96\xBC\x81A\x95W\x8F\x80\x82̃\x8D\x83O\x83t\x83@\x83C\x83\x8B\x96\xBC\x82Ƃ\xE0\x82ɁA\x83t\x83\x8B\x83p\x83X\x82łȂ\xA2\x8Fꍇ\x82\xC9<a href="../menu/setup-additional-log.html#LogDefaultPath">\x95W\x8F\x80\x82̃\x8D\x83O\x95ۑ\xB6\x90\xE6</a>\x82܂\xBD\x82\xCD<a href="../setup/folder.html#LogDir">\x83\x8D\x83O\x83t\x83H\x83\x8B\x83_</a>\x82\xA9\x82\xE7\x82̑\x8A\x91΃p\x83X\x82Ƃ݂Ȃ\xB7\x82悤\x82ɂ\xB5\x82\xBD\x81B</li>
+-->
     </ul>
   </li>
 

Modified: trunk/doc/en/html/commandline/teraterm.html
===================================================================
--- trunk/doc/en/html/commandline/teraterm.html	2022-01-29 16:49:55 UTC (rev 9708)
+++ trunk/doc/en/html/commandline/teraterm.html	2022-01-30 14:06:34 UTC (rev 9709)
@@ -191,7 +191,9 @@
       </ul></dd>
 
   <dt id="l">/L=<log file></dt>
-  <dd>Start Tera Term with logging.</dd>
+  <dd>Start Tera Term with logging.<br />
+      File name can include <a href="../menu/setup-additional-log.html#LogFileNameFormat">formats of Tera Term and strftime</a>.<br />
+      If this value is not a full path, it is understood as a relative path from <a href="../menu/setup-additional-log.html#LogDefaultPath">default log save folder</a>. If it is not specified, file name is understood as a relative path from <a href="../setup/folder.html#LogDir">log folder</a>.</dd>
 
   <dt id="la">/LA=<language></dt>
   <dd>Language mode.

Modified: trunk/doc/en/html/menu/setup-additional-log.html
===================================================================
--- trunk/doc/en/html/menu/setup-additional-log.html	2022-01-29 16:49:55 UTC (rev 9708)
+++ trunk/doc/en/html/menu/setup-additional-log.html	2022-01-30 14:06:34 UTC (rev 9709)
@@ -19,12 +19,15 @@
 
       <dt id="LogDefaultName">Default log file name(strftime format)</dt>
       <dd>
-	Specify default log file name. It can include a format of strftime.
+	Specify default log file name.<br />
+	<span id="LogFileNameFormat">It can include formats of Tera Term and strftime.</span>
 <pre>
-SYNOPSIS:
+SYNOPSIS of Tera Term:
 &h      Host name(or empty when not connecting)
 &p      TCP port number(or empty when not connecting, not TCP connection)
 &u      Logon user name
+
+SYNOPSIS of strftime:
 %a      Abbreviated weekday name
 %A      Full weekday name
 %b      Abbreviated month name
@@ -53,16 +56,8 @@
 
       <dt id="LogDefaultPath">Default log save folder</dt>
       <dd>
-	    <p>\x95W\x8F\x80\x82̃\x8D\x83O\x95ۑ\xB6\x90\xE6\x82\xF0\x8Ew\x92肵\x82܂\xB7\x81B
-
-        <p>\x8Ew\x92肪\x82Ȃ\xA2\x8Fꍇ\x82́Ateraterm.ini \x82\xCC [Tera Term] \x83Z\x83N\x83V\x83\x87\x83\x93 FileDir \x82Ŏw\x92肳\x82ꂽ
-          \x8A‹\xAB\x95ϐ\x94\x82\xF0\x93W\x8AJ\x82\xB3\x82ꂽ\x82̃t\x83H\x83\x8B\x83_\x82\xF0\x8Eg\x97p\x82\xB5\x82܂\xB7\x81B
-          (\x95\xB6\x8E\x9A\x97\xF1\x82Ɋ‹\xAB\x95ϐ\x94\x82\xAA\x8A܂܂\xEA\x82Ă\xA2\x82\xE9\x82ƓW\x8AJ\x82\xB3\x82\xEA\x82܂\xB7)
-
-        <p>\x90ݒ肳\x82\xEA\x82Ă\xA2\x82Ȃ\xA2\x8Fꍇ\x82́AOS\x82̃_\x83E\x83\x93\x83\x8D\x81[\x83h\x83t\x83H\x83\x8B\x83_\x82\xAA\x8Eg\x97p\x82\xB5\x82܂\xB7\x81B
-
-        <p>\x8Eg\x97p\x82ł\xAB\x82Ȃ\xA2\x8Fꍇ\x82́Attermpro.exe\x82̃t\x83H\x83\x8B\x83_\x82\xAA\x8Eg\x97p\x82\xB5\x82܂\xB7\x81B
-
+	    <p>Specify default log save folder that is used when log file name is not a full path.<br />
+           If it is not specified, <a href="../setup/folder.html#LogDir">log folder</a> is used.
       </dd>
 
       <dt id="LogAutoStart">Auto start logging</dt>

Modified: trunk/doc/ja/html/about/history.html
===================================================================
--- trunk/doc/ja/html/about/history.html	2022-01-29 16:49:55 UTC (rev 9708)
+++ trunk/doc/ja/html/about/history.html	2022-01-30 14:06:34 UTC (rev 9709)
@@ -40,6 +40,8 @@
       <ul>
         <li>TERATERM.INI \x82\xCC Tera Term \x83Z\x83N\x83V\x83\x87\x83\x93\x82\xC9 DPIAware=off \x82\xF0\x89\xC1\x82\xA6\x82\xE9\x82Ə]\x97\x88\x92ʂ\xE8\x82̓\xAE\x8D\xEC\x82ƂȂ\xE9</li>
       </ul>
+      <li>\x83R\x83}\x83\x93\x83h\x83\x89\x83C\x83\x93\x82Ŏw\x92肳\x82ꂽ\x83\x8D\x83O\x83t\x83@\x83C\x83\x8B\x96\xBC\x82\xF0\x81A\x95W\x8F\x80\x82̃\x8D\x83O\x83t\x83@\x83C\x83\x8B\x96\xBC\x82Ɠ\xAF\x82\xB6\x82悤\x82\xC9<a href="../menu/setup-additional-log.html#LogFileNameFormat">\x92u\x8A\xB7\x82\xB7\x82\xE9</a>\x82悤\x82ɂ\xB5\x82\xBD\x81B</li>
+      <li>\x83R\x83}\x83\x93\x83h\x83\x89\x83C\x83\x93\x82Ŏw\x92肳\x82ꂽ\x83\x8D\x83O\x83t\x83@\x83C\x83\x8B\x96\xBC\x81A\x95W\x8F\x80\x82̃\x8D\x83O\x83t\x83@\x83C\x83\x8B\x96\xBC\x82Ƃ\xE0\x82ɁA\x83t\x83\x8B\x83p\x83X\x82łȂ\xA2\x8Fꍇ\x82\xC9<a href="../menu/setup-additional-log.html#LogDefaultPath">\x95W\x8F\x80\x82̃\x8D\x83O\x95ۑ\xB6\x90\xE6</a>\x82܂\xBD\x82\xCD<a href="../setup/folder.html#LogDir">\x83\x8D\x83O\x83t\x83H\x83\x8B\x83_</a>\x82\xA9\x82\xE7\x82̑\x8A\x91΃p\x83X\x82Ƃ݂Ȃ\xB7\x82悤\x82ɂ\xB5\x82\xBD\x81B</li>
     </ul>
   </li>
 

Modified: trunk/doc/ja/html/commandline/teraterm.html
===================================================================
--- trunk/doc/ja/html/commandline/teraterm.html	2022-01-29 16:49:55 UTC (rev 9708)
+++ trunk/doc/ja/html/commandline/teraterm.html	2022-01-30 14:06:34 UTC (rev 9709)
@@ -192,7 +192,9 @@
       </ul></dd>
 
   <dt id="l">/L=<log file></dt>
-  <dd>\x8BN\x93\xAE\x8E\x9E\x82Ƀ\x8D\x83O\x82\xF0\x8AJ\x8En</dd>
+  <dd>\x8BN\x93\xAE\x8E\x9E\x82Ƀ\x8D\x83O\x82\xF0\x8AJ\x8En<br />
+      \x83t\x83@\x83C\x83\x8B\x96\xBC\x82Ɋ܂܂ꂽ<a href="../menu/setup-additional-log.html#LogFileNameFormat">Tera Term \x82\xC6 strftime \x82̏\x91\x8E\xAE</a>\x82\xAA\x89\xF0\x8E߂\xB3\x82\xEA\x82܂\xB7\x81B<br />
+      \x83t\x83@\x83C\x83\x8B\x96\xBC\x82\xAA\x90\xE2\x91΃p\x83X\x82łȂ\xA2\x82Ƃ\xAB\x82́A<a href="../menu/setup-additional-log.html#LogDefaultPath">\x95W\x8F\x80\x82̃\x8D\x83O\x95ۑ\xB6\x90\xE6</a>\x82\xA9\x82\xE7\x82̑\x8A\x91΃p\x83X\x82ƌ\xA9\x82Ȃ\xB3\x82\xEA\x82܂\xB7\x81B\x82\xBB\x82ꂪ\x90ݒ肳\x82\xEA\x82Ă\xA2\x82Ȃ\xA2\x8Fꍇ\x82\xCD<a href="../setup/folder.html#LogDir">\x83\x8D\x83O\x83t\x83H\x83\x8B\x83_</a>\x82\xA9\x82\xE7\x82̑\x8A\x91΃p\x83X\x82ƌ\xA9\x82Ȃ\xB3\x82\xEA\x82܂\xB7\x81B</dd>
 
   <dt id="la">/LA=<language></dt>
   <dd>\x8C\xBE\x8Cꃂ\x81[\x83h

Modified: trunk/doc/ja/html/menu/setup-additional-log.html
===================================================================
--- trunk/doc/ja/html/menu/setup-additional-log.html	2022-01-29 16:49:55 UTC (rev 9708)
+++ trunk/doc/ja/html/menu/setup-additional-log.html	2022-01-30 14:06:34 UTC (rev 9709)
@@ -19,12 +19,15 @@
 
       <dt id="LogDefaultName">Default log file name(strftime format)</dt>
       <dd>
-	\x95W\x8F\x80\x82̃\x8D\x83O\x83t\x83@\x83C\x83\x8B\x96\xBC\x82\xF0\x8Ew\x92肵\x82܂\xB7\x81Bstrftime \x82̏\x91\x8E\xAE\x82\xAA\x8Eg\x97p\x82ł\xAB\x82܂\xB7\x81B
+	\x95W\x8F\x80\x82̃\x8D\x83O\x83t\x83@\x83C\x83\x8B\x96\xBC\x82\xF0\x8Ew\x92肵\x82܂\xB7\x81B<br />
+	<span id="LogFileNameFormat">Tera Term \x82\xC6 strftime \x82̏\x91\x8E\xAE\x82\xAA\x8Eg\x97p\x82ł\xAB\x82܂\xB7\x81B</span>
 <pre>
-\x8F\x91\x8E\xAE:
+Tera Term \x82̏\x91\x8E\xAE:
 &h      \x83z\x83X\x83g\x96\xBC\x81B\x96\xA2\x90ڑ\xB1\x82̏ꍇ\x82͋\xF3\x81B
 &p      TCP \x83|\x81[\x83g\x94ԍ\x86\x81B\x96\xA2\x90ڑ\xB1\x82̏ꍇ\x82͋\xF3\x81BTCP \x90ڑ\xB1\x82łȂ\xA2\x82Ƃ\xAB\x82\xE0\x8B\xF3\x81B
 &u      \x83\x8D\x83O\x83I\x83\x93\x92\x86\x82̃\x86\x81[\x83U\x96\xBC\x81B
+
+strftime \x82̏\x91\x8E\xAE:
 %a      \x97j\x93\xFA\x82̏ȗ\xAA\x8C`\x81B
 %A      \x97j\x93\xFA\x82̐\xB3\x8E\xAE\x96\xBC\x81B
 %b      \x8C\x8E\x82̏ȗ\xAA\x8C`\x81B
@@ -53,16 +56,8 @@
 
       <dt id="LogDefaultPath">Default log save folder</dt>
       <dd>
-	    <p>\x95W\x8F\x80\x82̃\x8D\x83O\x95ۑ\xB6\x90\xE6\x82\xF0\x8Ew\x92肵\x82܂\xB7\x81B
-
-        <p>\x8Ew\x92肪\x82Ȃ\xA2\x8Fꍇ\x82́Ateraterm.ini \x82\xCC [Tera Term] \x83Z\x83N\x83V\x83\x87\x83\x93 FileDir \x82Ŏw\x92肳\x82ꂽ
-          \x8A‹\xAB\x95ϐ\x94\x82\xF0\x93W\x8AJ\x82\xB3\x82ꂽ\x82̃t\x83H\x83\x8B\x83_\x82\xF0\x8Eg\x97p\x82\xB5\x82܂\xB7\x81B
-          (\x95\xB6\x8E\x9A\x97\xF1\x82Ɋ‹\xAB\x95ϐ\x94\x82\xAA\x8A܂܂\xEA\x82Ă\xA2\x82\xE9\x82ƓW\x8AJ\x82\xB3\x82\xEA\x82܂\xB7)
-
-        <p>\x90ݒ肳\x82\xEA\x82Ă\xA2\x82Ȃ\xA2\x8Fꍇ\x82́AOS\x82̃_\x83E\x83\x93\x83\x8D\x81[\x83h\x83t\x83H\x83\x8B\x83_\x82\xAA\x8Eg\x97p\x82\xB5\x82܂\xB7\x81B
-
-        <p>\x8Eg\x97p\x82ł\xAB\x82Ȃ\xA2\x8Fꍇ\x82́Attermpro.exe\x82̃t\x83H\x83\x8B\x83_\x82\xAA\x8Eg\x97p\x82\xB5\x82܂\xB7\x81B
-
+	    \x83\x8D\x83O\x83t\x83@\x83C\x83\x8B\x96\xBC\x82\xAA\x83t\x83\x8B\x83p\x83X\x82łȂ\xA2\x82Ƃ\xAB\x82́A\x95W\x8F\x80\x82̃\x8D\x83O\x95ۑ\xB6\x90\xE6\x82\xF0\x8Ew\x92肵\x82܂\xB7\x81B<br />
+        \x90ݒ肳\x82\xEA\x82Ă\xA2\x82Ȃ\xA2\x8Fꍇ\x82́A<a href="../setup/folder.html#LogDir">\x83\x8D\x83O\x83t\x83H\x83\x8B\x83_</a>\x82\xAA\x8Eg\x97p\x82\xB3\x82\xEA\x82܂\xB7\x81B
       </dd>
 
       <dt id="LogAutoStart">Auto start logging</dt>

Modified: trunk/teraterm/teraterm/filesys_log.cpp
===================================================================
--- trunk/teraterm/teraterm/filesys_log.cpp	2022-01-29 16:49:55 UTC (rev 9708)
+++ trunk/teraterm/teraterm/filesys_log.cpp	2022-01-30 14:06:34 UTC (rev 9709)
@@ -1344,18 +1344,13 @@
  */
 wchar_t *FLogGetLogFilename(const wchar_t *log_filename)
 {
-	// \x83t\x83H\x83\x8B\x83_
-	char FileDirExpanded[MAX_PATH];
 	const char *logdir;
+
 	if (strlen(ts.LogDefaultPath) > 0) {
 		logdir = ts.LogDefaultPath;
 	}
-	else if (strlen(ts.FileDir) > 0) {
-		ExpandEnvironmentStrings(ts.FileDir, FileDirExpanded, sizeof(FileDirExpanded));
-		logdir = FileDirExpanded;
-	}
 	else {
-		logdir = ts.HomeDir;
+		logdir = ToCharW(ts.LogDirW);
 	}
 
 	// \x8C\xB3\x82ƂȂ\xE9\x83t\x83@\x83C\x83\x8B\x96\xBC

Modified: trunk/teraterm/teraterm/vtwin.cpp
===================================================================
--- trunk/teraterm/teraterm/vtwin.cpp	2022-01-29 16:49:55 UTC (rev 9708)
+++ trunk/teraterm/teraterm/vtwin.cpp	2022-01-30 14:06:34 UTC (rev 9709)
@@ -3341,8 +3341,11 @@
 	if (ts.LogAutoStart || ts.LogFN[0] != 0) {
 		if (ts.LogFN == NULL || ts.LogFN[0] == 0) {
 			ts.LogFNW = FLogGetLogFilename(NULL);
-			WideCharToACP_t(ts.LogFNW, ts.LogFN, sizeof(ts.LogFN));
 		}
+		else {
+			ts.LogFNW = FLogGetLogFilename(ToWcharA(ts.LogFN));
+		}
+		WideCharToACP_t(ts.LogFNW, ts.LogFN, sizeof(ts.LogFN));
 		if (ts.LogFN[0]!=0) {
 			FLogOpen(ts.LogFNW, LOG_UTF8, FALSE);
 		}

• 前の記事 (スレッド) [ttssh2-commit] [9708] reference/keyboard_cfg.md を setup/keyboard.html にマージした
• 次の記事 (スレッド) [ttssh2-commit] [9710] 「My Documents に broadcast.log が存在する場合に使う」動作を削除
• 記事の並び順: [ 日付 ] [ スレッド ] [ 件名 ] [ 著者 ]