Commit: 229d87a517561db9cb0ae4b943c5982b5f1a52a6 - ffftp (git)

FFFTPのソースコードです。

Commit MetaInfo

• Revision: 229d87a517561db9cb0ae4b943c5982b5f1a52a6 (tree)
• Zeit: 2016-03-23 22:47:14
• Autor: s_kawamoto <s_kawamoto@user...>
• Commiter: s_kawamoto

Log Message

Change behavior of automatic software update.
Fix bugs of connection settings history.

Ändern Zusammenfassung

• modified: FFFTP_Eng_Release/FFFTP.exe
• modified: FFFTP_Eng_Release_64/FFFTP.exe
• modified: Release/FFFTP.exe
• modified: Release_64/FFFTP.exe
• modified: common.h
• modified: history.c
• modified: updater.c
• modified: updater.h

Diff

Binary files a/FFFTP_Eng_Release/FFFTP.exe and b/FFFTP_Eng_Release/FFFTP.exe differ

Binary files a/FFFTP_Eng_Release_64/FFFTP.exe and b/FFFTP_Eng_Release_64/FFFTP.exe differ

Binary files a/Release/FFFTP.exe and b/Release/FFFTP.exe differ

Binary files a/Release_64/FFFTP.exe and b/Release_64/FFFTP.exe differ

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

--- a/history.c
+++ b/history.c
@@ -334,7 +334,9 @@ void CopyDefaultHistory(HISTORYDATA *Set)
 {
 	HOSTDATA Host;
 
-	CopyDefaultHost(&Host);
+	// ホスト共通設定機能
+//	CopyDefaultHost(&Host);
+	CopyDefaultDefaultHost(&Host);
 	CopyHostToHistory(&Host, Set);
 	return;
 }

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

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