svnno****@sourc*****
svnno****@sourc*****
2010年 5月 14日 (金) 21:21:05 JST
Tera TermRevision: 3887
http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=3887
Author: doda
Date: 2010-05-14 21:21:04 +0900 (Fri, 14 May 2010)
Log Message:
-----------
"ファイルé€ä¿¡" 㨠"ãƒã‚°" ã® binary flag を分離。
http://sourceforge.jp/ticket/browse.php?group_id=1412&tid=20881
Modified Paths:
--------------
trunk/doc/en/html/about/history.html
trunk/doc/ja/html/about/history.html
trunk/installer/release/TERATERM.INI
trunk/teraterm/common/tttypes.h
trunk/teraterm/teraterm/filesys.cpp
trunk/teraterm/teraterm/ttdde.c
trunk/teraterm/ttpset/ttset.c
-------------- next part --------------
Modified: trunk/doc/en/html/about/history.html
===================================================================
--- trunk/doc/en/html/about/history.html 2010-05-13 15:47:13 UTC (rev 3886)
+++ trunk/doc/en/html/about/history.html 2010-05-14 12:21:04 UTC (rev 3887)
@@ -51,6 +51,7 @@
</ul></li>
<li>added the "<a href="../macro/command/filestat.html">filestat</a>" macro command.</li>
<li>added support for <a href="../usage/tips/xterm.html#Bracketed">bracketed paste mode</a>.</a>
+ <!--li>"ƒtƒ@ƒCƒ‹‘—M" ‚Æ "ƒƒO" ‚Å‚Ì binary ƒtƒ‰ƒO‚̈µ‚¢‚𕪗£‚µ‚½B</li-->
</ul>
</li>
Modified: trunk/doc/ja/html/about/history.html
===================================================================
--- trunk/doc/ja/html/about/history.html 2010-05-13 15:47:13 UTC (rev 3886)
+++ trunk/doc/ja/html/about/history.html 2010-05-14 12:21:04 UTC (rev 3887)
@@ -51,6 +51,7 @@
</ul></li>
<li>ƒ}ƒNƒƒRƒ}ƒ“ƒh "<a href="../macro/command/filestat.html">filestat</a>" ‚ð’ljÁ‚µ‚½B</li>
<li><a href="../usage/tips/xterm.html#Bracketed">Bracketed Paste Mode</a>‚ɑΉž‚µ‚½B</a>
+ <li>"ƒtƒ@ƒCƒ‹‘—M" ‚Æ "ƒƒO" ‚Å‚Ì binary ƒtƒ‰ƒO‚̈µ‚¢‚𕪗£‚µ‚½B</li>
</ul>
</li>
Modified: trunk/installer/release/TERATERM.INI
===================================================================
--- trunk/installer/release/TERATERM.INI 2010-05-13 15:47:13 UTC (rev 3886)
+++ trunk/installer/release/TERATERM.INI 2010-05-14 12:21:04 UTC (rev 3887)
@@ -264,8 +264,11 @@
; History list of hosts
HistoryList=on
-; Binary flag for Send File and Log (on/off)
+; Binary flag for Send File (on/off)
TransBin=off
+
+; Binary flag for Log (on/off)
+LogBinary=off
; Log append (on/off)
LogAppend=on
; plain text flag for Log (on/off)
Modified: trunk/teraterm/common/tttypes.h
===================================================================
--- trunk/teraterm/common/tttypes.h 2010-05-13 15:47:13 UTC (rev 3886)
+++ trunk/teraterm/common/tttypes.h 2010-05-14 12:21:04 UTC (rev 3887)
@@ -494,6 +494,7 @@
WORD EnableLineMode;
char ConfirmChangePasteStringFile[MAX_PATH];
DWORD Baud;
+ WORD LogBinary;
};
typedef struct tttset TTTSet, *PTTSet;
@@ -919,6 +920,7 @@
* - At version 4.66, ttset_memfilemap was replaced with ttset_memfilemap_12.
* renamed tttset.Baud to Baud_.
* added tttset.Baud.
+ * added tttset.LogBinary.
*
* - At version 4.63, ttset_memfilemap was replaced with ttset_memfilemap_11.
* added tttset.Wait4allMacroCommand.
Modified: trunk/teraterm/teraterm/filesys.cpp
===================================================================
--- trunk/teraterm/teraterm/filesys.cpp 2010-05-13 15:47:13 UTC (rev 3886)
+++ trunk/teraterm/teraterm/filesys.cpp 2010-05-14 12:21:04 UTC (rev 3887)
@@ -332,7 +332,7 @@
void FixLogOption()
{
- if (ts.TransBin) {
+ if (ts.LogBinary) {
ts.LogTypePlainText = false;
ts.LogTimestamp = false;
}
@@ -374,7 +374,7 @@
// 0x2000 = timestamp (2006.7.23 maya)
// 0x4000 = hide file transfer dialog (2008.1.30 maya)
// teraterm.ini‚ÌÝ’è‚ðŒ©‚Ä‚©‚çƒfƒtƒHƒ‹ƒgƒIƒvƒVƒ‡ƒ“‚ðŒˆ‚ß‚éB(2005.5.7 yutaka)
- Option = MAKELONG(ts.TransBin,
+ Option = MAKELONG(ts.LogBinary,
ts.Append |
(0x1000 * ts.LogTypePlainText) |
(0x2000 * ts.LogTimestamp) |
@@ -395,7 +395,7 @@
FreeTTFILE();
return FALSE;
}
- ts.TransBin = LOWORD(Option);
+ ts.LogBinary = LOWORD(Option);
ts.Append = HIWORD(Option);
if (ts.Append & 0x1000) {
@@ -439,7 +439,7 @@
FixLogOption();
}
- if (ts.TransBin > 0)
+ if (ts.LogBinary > 0)
{
BinLog = TRUE;
FileLog = FALSE;
Modified: trunk/teraterm/teraterm/ttdde.c
===================================================================
--- trunk/teraterm/teraterm/ttdde.c 2010-05-13 15:47:13 UTC (rev 3886)
+++ trunk/teraterm/teraterm/ttdde.c 2010-05-14 12:21:04 UTC (rev 3887)
@@ -511,7 +511,7 @@
LogVar->NoMsg = TRUE;
strncpy_s(LogVar->FullName, sizeof(LogVar->FullName),ParamFileName, _TRUNCATE);
ParseStrftimeFileName(LogVar->FullName, sizeof(LogVar->FullName));
- ts.TransBin = ParamBinaryFlag;
+ ts.LogBinary = ParamBinaryFlag;
ts.Append = ParamAppendFlag;
ret = LogStart();
if (ret) {
Modified: trunk/teraterm/ttpset/ttset.c
===================================================================
--- trunk/teraterm/ttpset/ttset.c 2010-05-13 15:47:13 UTC (rev 3886)
+++ trunk/teraterm/ttpset/ttset.c 2010-05-14 12:21:04 UTC (rev 3887)
@@ -710,6 +710,9 @@
/* File transfer binary flag */
ts->TransBin = GetOnOff(Section, "TransBin", FName, FALSE);
+ /* Log binary flag */
+ ts->LogBinary = GetOnOff(Section, "LogBinary", FName, FALSE);
+
/* Log append */
ts->Append = GetOnOff(Section, "LogAppend", FName, FALSE);
@@ -1878,10 +1881,13 @@
/* File transfer binary flag */
WriteOnOff(Section, "TransBin", FName, ts->TransBin);
+ /* Log binary flag */
+ WriteOnOff(Section, "LogBinary", FName, ts->LogBinary);
+
/* Log append */
WriteOnOff(Section, "LogAppend", FName, ts->Append);
- /* File transfer binary flag */
+ /* Log plain text flag */
WriteOnOff(Section, "LogTypePlainText", FName, ts->LogTypePlainText);
/* Log with timestamp (2006.7.23 maya) */