Merge pull request #176 from sempreff/feature/DisableIniAutoBackup

allow users to select create backup or not
TeraTermProject · Mar 20, 2024 · c23ca86 · c23ca86
2 parents 8d63898 + 1df249c
commit c23ca86
Show file tree

Hide file tree

Showing 10 changed files with 58 additions and 2 deletions.
diff --git a/doc/en/html/about/history.html b/doc/en/html/about/history.html
@@ -39,6 +39,7 @@ <h3 id="teraterm_5.3">YYYY.MM.DD (Ver 5.3 not released yet)</h3>
       <li>MACRO: When TTL file is relative path, it is relative from current directory of ttpmacro.</li>
       <li>Use EnableContinuedLineCopy setting when dragging after selecting a word by double click.</li>
       <li>Show error messagebox when logging cannot be started with LogAutoStart=on</li>
+      <li>allow users to select creating automatic backup or not by <a href="../setup/teraterm-misc.html#IniAutoBackup">IniAutoBackup</a> when overwriting the ini file.
     </ul>
   </li>
 

diff --git a/doc/en/html/setup/teraterm-ini.html b/doc/en/html/setup/teraterm-ini.html
@@ -547,6 +547,12 @@ <h2>Tera Term</h2>
 		<td style="width:250px;">off</td>
 		<td></td>
 	</tr>
+	<tr>
+		<td id="IniAutoBackup"><a href="teraterm-misc.html#IniAutoBackup">IniAutoBackup</a></td>
+		<td style="width:250px;">on</td>
+		<td style="width:250px;">&lt;-</td>
+		<td></td>
+	</tr>
 	<tr>
 		<td id="EnableLineMode"><a href="teraterm-com.html#linemode">EnableLineMode</a></td>
 		<td style="width:250px;">on</td>

diff --git a/doc/en/html/setup/teraterm-misc.html b/doc/en/html/setup/teraterm-misc.html
@@ -427,5 +427,21 @@ <h1 id="HighDPI">High DPI Aware</h1>
 Tera Term is using the Per-monitor DPI awareness V2 feature that is supported on the Windows 10 Version 1703 or later. For more details of the Per-monitor DPI awareness V2, see the <a href="https://blogs.windows.com/buildingapps/2017/04/04/high-dpi-scaling-improvements-desktop-applications-windows-10-creators-update/" target="_blank"> High-DPI Scaling Improvements for Desktop Applications in the Windows 10 Creators Update (1703)</a>.
 </p>
 
+<h1 id="IniAutoBackup">Auto backup of Tera Term setup file</h1>
+
+<p>
+When overwriting an existing setup file, a backup file is created automatically.
+If you do not need a backup file, change the IniAutoBackup entry of [Tera Term] section as the following: 
+</p>
+
+<pre>
+IniAutoBackup=off
+</pre>
+
+<pre>
+Default:
+IniAutoBackup=on
+</pre>
+
 </BODY>
 </HTML>
diff --git a/doc/ja/html/about/history.html b/doc/ja/html/about/history.html
@@ -39,6 +39,7 @@ <h3 id="teraterm_5.3">YYYY.MM.DD (Ver 5.3 not released yet)</h3>
       <li>MACRO: TTLファイルを相対パスで指定したとき、ttpmacroのカレントディレクトリ相対で扱うようにした。</li>
       <li>ダブルクリックでワード選択後のドラッグ時、EnableContinuedLineCopy を反映してするようにした。</li>
       <li>LogAutoStart=on でログ記録が開始できないとき、エラーメッセージを表示するようにした。</li>
+      <li>iniファイルを上書きする際に自動バックアップを作成するかどうかを <a href="../setup/teraterm-misc.html#IniAutoBackup">IniAutoBackup</a> で設定できるようにした。</li>
     </ul>
   </li>
 

diff --git a/doc/ja/html/setup/teraterm-ini.html b/doc/ja/html/setup/teraterm-ini.html
@@ -553,6 +553,12 @@ <h2>Tera Term</h2>
 		<td style="width:250px;">off</td>
 		<td></td>
 	</tr>
+	<tr>
+		<td id="IniAutoBackup"><a href="teraterm-misc.html#IniAutoBackup">IniAutoBackup</a></td>
+		<td style="width:250px;">on</td>
+		<td style="width:250px;">&lt;-</td>
+		<td></td>
+	</tr>
 	<tr>
 		<td id="EnableLineMode"><a href="teraterm-com.html#linemode">EnableLineMode</a></td>
 		<td style="width:250px;">on</td>

diff --git a/doc/ja/html/setup/teraterm-misc.html b/doc/ja/html/setup/teraterm-misc.html
@@ -456,5 +456,21 @@
 Creators Update (1703)</a>を参照ください。
 </p>
 
+<h1 id="IniAutoBackup">設定ファイルの自動バックアップ</h1>
+
+<p>
+既存の設定ファイルに上書きする場合、バックアップファイルが自動的に作られます。
+自動バックアップが不要であれば、設定ファイルの [Tera Term] セクションの IniAutoBackup 行を以下のように変更してください。
+</p>
+
+<pre>
+IniAutoBackup=off
+</pre>
+
+<pre>
+Default:
+IniAutoBackup=on
+</pre>
+
 </BODY>
 </HTML>
diff --git a/installer/release/TERATERM.INI b/installer/release/TERATERM.INI
@@ -790,6 +790,7 @@ UnicodeEmojiOverride=
 UnicodeEmojiWidth=
 FallbackToCP932=off
 DrawingResizedFont=on
+IniAutoBackup=on
 
 [TTSSH]
 ; SSH enabled flag (1=enabled 0=disabled)

diff --git a/teraterm/common/tttypes.h b/teraterm/common/tttypes.h
@@ -612,6 +612,7 @@ struct tttset {
 	wchar_t *LogDefaultNameW;
 	BOOL Dec2Unicode;
 	wchar_t *DelimListW;
+	WORD IniAutoBackup;
 
 	// Experimental
 	BYTE ExperimentalTreeProprtySheetEnable;

diff --git a/teraterm/teraterm/vtwin.cpp b/teraterm/teraterm/vtwin.cpp
@@ -4623,8 +4623,10 @@ void CVTWindow::OnSetupSave()
 
 		if (wcscmp(PrevSetupFNW, ts.SetupFNameW) == 0) {
 			// 同名ファイルへ書き込み(上書き)
-			// バックアップを作成
-			CreateBakupFile(ts.SetupFNameW, NULL);
+			if (ts.IniAutoBackup) {
+				// バックアップを作成
+				CreateBakupFile(ts.SetupFNameW, NULL);
+			}
 		}
 		else {
 			// 異なるファイルへ書き込み

diff --git a/teraterm/ttpset/ttset.c b/teraterm/ttpset/ttset.c
@@ -2088,6 +2088,9 @@ void PASCAL _ReadIniFile(const wchar_t *FName, PTTSet ts)
 
 	ts->Dec2Unicode = FALSE;
 
+	// 自動バックアップ
+	ts->IniAutoBackup = GetOnOff(Section, "IniAutoBackup", FName, TRUE);
+
 	// Experimental
 	ts->ExperimentalTreeProprtySheetEnable = GetOnOff("Experimental", "TreeProprtySheet", FName, FALSE);
 	ts->ExperimentalDontUseFontDialog = GetOnOff("Experimental", "DontUseFontDialog", FName, FALSE);
@@ -3315,6 +3318,9 @@ void PASCAL _WriteIniFile(const wchar_t *FName, PTTSet ts)
 
 	// 通知音
 	WriteOnOff(Section, "NotifySound", FName, ts->NotifySound);
+
+	// 自動バックアップ
+	WriteOnOff(Section, "IniAutoBackup", FName, ts->IniAutoBackup);
 }
 
 void PASCAL _CopySerialList(const wchar_t *IniSrc, const wchar_t *IniDest, const wchar_t *section,