• R/O
  • SSH
  • HTTPS

ttssh2: Commit


Commit MetaInfo

Revision5178 (tree)
Time2013-03-27 21:32:03
Author(del#1144)

Log Message

LogLockExclusive が正しく動作しない問題を修正

Change Summary

Incremental Difference

--- trunk/teraterm/teraterm/filesys.cpp (revision 5177)
+++ trunk/teraterm/teraterm/filesys.cpp (revision 5178)
@@ -494,8 +494,8 @@
494494 if (ts.Append > 0)
495495 {
496496 int dwShareMode = 0;
497- if (ts.LogLockExclusive) {
498- dwShareMode = FILE_SHARE_READ;
497+ if (!ts.LogLockExclusive) {
498+ dwShareMode = FILE_SHARE_READ | FILE_SHARE_WRITE;
499499 }
500500 LogVar->FileHandle = (int)CreateFile(LogVar->FullName, GENERIC_WRITE, dwShareMode, NULL,
501501 OPEN_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL);
@@ -510,8 +510,8 @@
510510 }
511511 else {
512512 int dwShareMode = 0;
513- if (ts.LogLockExclusive) {
514- dwShareMode = FILE_SHARE_READ;
513+ if (!ts.LogLockExclusive) {
514+ dwShareMode = FILE_SHARE_READ | FILE_SHARE_WRITE;
515515 }
516516 LogVar->FileHandle = (int)CreateFile(LogVar->FullName, GENERIC_WRITE, dwShareMode, NULL,
517517 CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL);
@@ -712,8 +712,8 @@
712712 }
713713
714714 // 再オープン
715- if (ts.LogLockExclusive) {
716- dwShareMode = FILE_SHARE_READ;
715+ if (!ts.LogLockExclusive) {
716+ dwShareMode = FILE_SHARE_READ | FILE_SHARE_WRITE;
717717 }
718718 LogVar->FileHandle = (int)CreateFile(LogVar->FullName, GENERIC_WRITE, dwShareMode, NULL,
719719 CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL);
--- trunk/doc/en/html/about/history.html (revision 5177)
+++ trunk/doc/en/html/about/history.html (revision 5178)
@@ -59,6 +59,7 @@
5959 <li>Bug fixes
6060 <ul>
6161 <li>Can not open a file including the IPv6 address in the &h of the log file.</li>
62+ <!--li><a href="../setup/teraterm-misc.html#LogLockExclusive">LogLockExclusive</a>をoffにしても排他ロックがかかる問題を修正した。</li-->
6263 </ul>
6364 </li>
6465
--- trunk/doc/ja/html/about/history.html (revision 5177)
+++ trunk/doc/ja/html/about/history.html (revision 5178)
@@ -58,6 +58,7 @@
5858 <li>バグ修正
5959 <ul>
6060 <li>デフォルトログファイル名の&hにIPv6アドレスを含めると、ファイルがオープンできない。</li>
61+ <li><a href="../setup/teraterm-misc.html#LogLockExclusive">LogLockExclusive</a>をoffにしても排他ロックがかかる問題を修正した。</li>
6162 </ul>
6263 </li>
6364
Show on old repository browser