Change behavior of automatic software update.

Fix bugs of connection settings history.

diff --git a/FFFTP_Eng_Release/FFFTP.exe b/FFFTP_Eng_Release/FFFTP.exe
index 8782501..e223bc8 100644 (file)
Binary files a/FFFTP_Eng_Release/FFFTP.exe and b/FFFTP_Eng_Release/FFFTP.exe differ

diff --git a/FFFTP_Eng_Release_64/FFFTP.exe b/FFFTP_Eng_Release_64/FFFTP.exe
index 4c75812..86073ad 100644 (file)
Binary files a/FFFTP_Eng_Release_64/FFFTP.exe and b/FFFTP_Eng_Release_64/FFFTP.exe differ

diff --git a/Release/FFFTP.exe b/Release/FFFTP.exe
index 6f4fb64..2d8623c 100644 (file)
Binary files a/Release/FFFTP.exe and b/Release/FFFTP.exe differ

diff --git a/Release_64/FFFTP.exe b/Release_64/FFFTP.exe
index 5ded2cd..71dac52 100644 (file)
Binary files a/Release_64/FFFTP.exe and b/Release_64/FFFTP.exe differ

diff --git a/common.h b/common.h
index 3ae9e2b..f42d95d 100644 (file)
--- a/common.h
+++ b/common.h
@@ -81,7 +81,7 @@
 // ソフトウェア自動更新\r
 // リリースバージョンはリリース予定年（10進数4桁）+月（2桁）+日（2桁）+通し番号（0スタート2桁）とする\r
 // 2014年7月31日中の30個目のリリースは2014073129\r
-#define RELEASE_VERSION_NUM            2016032000      /* リリースバージョン */\r
+#define RELEASE_VERSION_NUM            2016032300      /* リリースバージョン */\r
 \r
 \r
 // SourceForge.JPによるフォーク\r

diff --git a/history.c b/history.c
index 7d6af76..5ff77fa 100644 (file)
--- a/history.c
+++ b/history.c
@@ -334,7 +334,9 @@ void CopyDefaultHistory(HISTORYDATA *Set)
 {\r
        HOSTDATA Host;\r
 \r
-       CopyDefaultHost(&Host);\r
+       // ホスト共通設定機能\r
+//     CopyDefaultHost(&Host);\r
+       CopyDefaultDefaultHost(&Host);\r
        CopyHostToHistory(&Host, Set);\r
        return;\r
 }\r

diff --git a/updater.c b/updater.c
index d60464d..76ed554 100644 (file)
--- a/updater.c
+++ b/updater.c
@@ -226,10 +226,11 @@ DWORD ListUpdateFile(UPDATE_LIST* pList, DWORD MaxCount, LPCTSTR ServerPath, LPC
                        {\r
                                if(_tcscmp(Find.cFileName, _T(".")) != 0 && _tcscmp(Find.cFileName, _T("..")) != 0)\r
                                {\r
-                                       if(_tcslen(ServerPath) + _tcslen(_T("/")) + _tcslen(Find.cFileName) < 128 && _tcslen(Path) + _tcslen(_T("\\")) + _tcslen(Find.cFileName) < 128)\r
+//                                     if(_tcslen(ServerPath) + _tcslen(_T("/")) + _tcslen(Find.cFileName) < 128 && _tcslen(Path) + _tcslen(_T("\\")) + _tcslen(Find.cFileName) < 128)\r
+                                       if(_tcslen(ServerPath) + _tcslen(Find.cFileName) < 128 && _tcslen(Path) + _tcslen(_T("\\")) + _tcslen(Find.cFileName) < 128)\r
                                        {\r
                                                _tcscpy(Temp1, ServerPath);\r
-                                               _tcscat(Temp1, _T("/"));\r
+//                                             _tcscat(Temp1, _T("/"));\r
                                                _tcscat(Temp1, Find.cFileName);\r
                                                _tcscpy(Temp2, Path);\r
                                                _tcscat(Temp2, _T("\\"));\r

diff --git a/updater.h b/updater.h
index 8e62e8b..a556681 100644 (file)
--- a/updater.h
+++ b/updater.h
@@ -7,23 +7,23 @@
 \r
 #include <windows.h>\r
 \r
-#define HTTP_USER_AGENT "Mozilla/4.0"\r
-#define UPDATE_SERVER "ffftp.osdn.jp"\r
+#define HTTP_USER_AGENT "curl/6.0"\r
+#define UPDATE_SERVER "osdn.jp"\r
 #if defined(_M_IX86)\r
 #if !defined(FFFTP_ENGLISH)\r
-#define UPDATE_HASH_PATH "/update/jpn/hash"\r
-#define UPDATE_LIST_PATH "/update/jpn/list"\r
+#define UPDATE_HASH_PATH "/dl/ffftp/update+jpn+hash"\r
+#define UPDATE_LIST_PATH "/dl/ffftp/update+jpn+list"\r
 #else\r
-#define UPDATE_HASH_PATH "/update/eng/hash"\r
-#define UPDATE_LIST_PATH "/update/eng/list"\r
+#define UPDATE_HASH_PATH "/dl/ffftp/update+eng+hash"\r
+#define UPDATE_LIST_PATH "/dl/ffftp/update+eng+list"\r
 #endif\r
 #elif defined(_M_AMD64)\r
 #if !defined(FFFTP_ENGLISH)\r
-#define UPDATE_HASH_PATH "/update/amd64/jpn/hash"\r
-#define UPDATE_LIST_PATH "/update/amd64/jpn/list"\r
+#define UPDATE_HASH_PATH "/dl/ffftp/update+amd64+jpn+hash"\r
+#define UPDATE_LIST_PATH "/dl/ffftp/update+amd64+jpn+list"\r
 #else\r
-#define UPDATE_HASH_PATH "/update/amd64/eng/hash"\r
-#define UPDATE_LIST_PATH "/update/amd64/eng/list"\r
+#define UPDATE_HASH_PATH "/dl/ffftp/update+amd64+eng+hash"\r
+#define UPDATE_LIST_PATH "/dl/ffftp/update+amd64+eng+list"\r
 #endif\r
 #endif\r
 #define UPDATE_RSA_PUBLIC_KEY \\r