Fix bugs of file deletion code on transfer thread (but it is unused).

[ffftp/ffftp.git] / registory.c

diff --git a/registory.c b/registory.c
index fa6461d..2635ed5 100644 (file)
--- a/registory.c
+++ b/registory.c
@@ -466,6 +466,10 @@ void SaveRegistory(void)
                                                        SaveIntNum(hKey5, "FTPES", Hist.UseFTPES, DefaultHist.UseFTPES);\r
                                                        SaveIntNum(hKey5, "FTPIS", Hist.UseFTPIS, DefaultHist.UseFTPIS);\r
                                                        SaveIntNum(hKey5, "SFTP", Hist.UseSFTP, DefaultHist.UseSFTP);\r
+                                                       // 同時接続対応\r
+                                                       SaveIntNum(hKey5, "ThreadCount", Hist.MaxThreadCount, DefaultHist.MaxThreadCount);\r
+                                                       // MLSD対応\r
+                                                       SaveIntNum(hKey5, "MLSD", Hist.UseMLSD, DefaultHist.UseMLSD);\r
 \r
                                                        CloseSubKey(hKey5);\r
                                                        n++;\r
@@ -538,6 +542,10 @@ void SaveRegistory(void)
                                                        SaveIntNum(hKey5, "FTPES", Host.UseFTPES, DefaultHost.UseFTPES);\r
                                                        SaveIntNum(hKey5, "FTPIS", Host.UseFTPIS, DefaultHost.UseFTPIS);\r
                                                        SaveIntNum(hKey5, "SFTP", Host.UseSFTP, DefaultHost.UseSFTP);\r
+                                                       // 同時接続対応\r
+                                                       SaveIntNum(hKey5, "ThreadCount", Host.MaxThreadCount, DefaultHost.MaxThreadCount);\r
+                                                       // MLSD対応\r
+                                                       SaveIntNum(hKey5, "MLSD", Host.UseMLSD, DefaultHost.UseMLSD);\r
                                                }\r
                                                CloseSubKey(hKey5);\r
                                        }\r
@@ -605,7 +613,7 @@ int LoadRegistory(void)
 \r
        if(i == FFFTP_SUCCESS)\r
        {\r
-               char checkbuf[48];\r
+//             char checkbuf[48];\r
                int salt = 0;\r
                Sts = YES;\r
 \r
@@ -792,6 +800,10 @@ int LoadRegistory(void)
                                        ReadIntValueFromReg(hKey5, "FTPES", &Hist.UseFTPES);\r
                                        ReadIntValueFromReg(hKey5, "FTPIS", &Hist.UseFTPIS);\r
                                        ReadIntValueFromReg(hKey5, "SFTP", &Hist.UseSFTP);\r
+                                       // 同時接続対応\r
+                                       ReadIntValueFromReg(hKey5, "ThreadCount", &Hist.MaxThreadCount);\r
+                                       // MLSD対応\r
+                                       ReadIntValueFromReg(hKey5, "MLSD", &Hist.UseMLSD);\r
 \r
                                        CloseSubKey(hKey5);\r
                                        AddHistoryToHistory(&Hist);\r
@@ -816,6 +828,9 @@ int LoadRegistory(void)
                                                Host.Pasv = NO;\r
                                                Host.ListCmdOnly = NO;\r
                                        }\r
+                                       // 1.97b以前はデフォルトでShift_JIS\r
+                                       if(Version < 1980)\r
+                                               Host.NameKanjiCode = KANJI_SJIS;\r
                                        ReadIntValueFromReg(hKey5, "Set", &Host.Level);\r
 \r
                                        ReadStringFromReg(hKey5, "HostName", Host.HostName, HOST_NAME_LEN+1);\r
@@ -863,6 +878,10 @@ int LoadRegistory(void)
                                        ReadIntValueFromReg(hKey5, "FTPES", &Host.UseFTPES);\r
                                        ReadIntValueFromReg(hKey5, "FTPIS", &Host.UseFTPIS);\r
                                        ReadIntValueFromReg(hKey5, "SFTP", &Host.UseSFTP);\r
+                                       // 同時接続対応\r
+                                       ReadIntValueFromReg(hKey5, "ThreadCount", &Host.MaxThreadCount);\r
+                                       // MLSD対応\r
+                                       ReadIntValueFromReg(hKey5, "MLSD", &Host.UseMLSD);\r
 \r
                                        CloseSubKey(hKey5);\r
 \r