Commit: b25718f200a2ea7a8af5ba1476a2b3c3b7cff401 - ffftp (git)

Loweynet

Commit MetaInfo

• Revisión: b25718f200a2ea7a8af5ba1476a2b3c3b7cff401 (tree)
• Tiempo: 2014-12-06 14:02:17
• Autor: s_kawamoto <s_kawamoto@user...>
• Commiter: s_kawamoto

Log Message

Add options to control the behavior of mirroring transfer.

Cambiar Resumen

• modified: FFFTP_Eng_Release/FFFTP.exe
• modified: Release/FFFTP.exe
• modified: Resource/FFFTP.rc
• modified: Resource/resource.h
• modified: Resource_eng/ffftp.rc
• modified: Resource_eng/resource.h
• modified: common.h
• modified: ftpproc.c
• modified: getput.c
• modified: main.c
• modified: option.c
• modified: registry.c

Diferencia incremental

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

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

--- a/Resource/FFFTP.rc
+++ b/Resource/FFFTP.rc
@@ -929,6 +929,7 @@ BEGIN
     CONTROL         "ƒ~ƒ‰[ƒŠƒ“ƒOƒAƒbƒvƒ[ƒh‚Ńtƒ@ƒCƒ‹íœ‘O‚ÉŠm”F(&U)",MIRROR_UPDEL_NOTIFY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,111,174,10
     CONTROL         "ƒ~ƒ‰[ƒŠƒ“ƒOƒ_ƒEƒ“ƒ[ƒh‚Ńtƒ@ƒCƒ‹íœ‘O‚ÉŠm”F(&D)",MIRROR_DOWNDEL_NOTIFY,
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,125,174,10
+    CONTROL         "ƒ~ƒ‰[ƒŠƒ“ƒO‚Ńtƒ@ƒCƒ‹“à—e‚ð“]‘—‚µ‚È‚¢(&F)",MIRROR_NO_TRANSFER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,139,174,10
 END
 
 somecmd_dlg DIALOG  0, 0, 187, 61
@@ -1111,11 +1112,12 @@ FONT 9, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
     LTEXT           "ŽŸ‚̃tƒ@ƒCƒ‹‚ð“]‘—/íœ‚µ‚Ü‚·B",-1,7,6,160,8
     LISTBOX         MIRROR_LIST,7,16,160,78,LBS_NOINTEGRALHEIGHT | LBS_EXTENDEDSEL | WS_VSCROLL | WS_TABSTOP
+    CONTROL         "ƒtƒ@ƒCƒ‹“à—e‚ð“]‘—‚µ‚È‚¢(&F)",MIRROR_NO_TRANSFER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,98,98,10
     DEFPUSHBUTTON   "ŽÀs",IDOK,7,153,50,14
     PUSHBUTTON      "ƒLƒƒƒ“ƒZƒ‹",IDCANCEL,62,153,50,14
     SCROLLBAR       MIRROR_SIZEGRIP,164,158,10,13,SBS_BOTTOMALIGN | SBS_VERT | SBS_SIZEGRIP
     PUSHBUTTON      "ƒwƒ‹ƒv",9,117,153,50,14
-    PUSHBUTTON      "‘I‚ñ‚¾ˆ—‚ð‚µ‚È‚¢",MIRROR_DEL,96,96,71,14,NOT WS_TABSTOP
+    PUSHBUTTON      "ˆê——‚©‚çíœ",MIRROR_DEL,111,96,56,14,NOT WS_TABSTOP
     LTEXT           "",MIRROR_COPYNUM,7,115,160,8
     LTEXT           "",MIRROR_MAKENUM,7,126,160,8
     LTEXT           "",MIRROR_DELNUM,7,137,160,8
@@ -1126,8 +1128,9 @@ STYLE DS_LOCALEDIT | DS_SETFONT | WS_POPUP | WS_CLIPCHILDREN | WS_CAPTION | WS_S
 CAPTION "ƒ~ƒ‰[ƒŠƒ“ƒOƒ_ƒEƒ“ƒ[ƒh"
 FONT 9, "MS Shell Dlg"
 BEGIN
-    LTEXT           "ŽŸ‚̏ˆ—‚ðs‚¢‚Ü‚·B",-1,7,6,92,8
+    LTEXT           "ŽŸ‚̃tƒ@ƒCƒ‹‚ð“]‘—/íœ‚µ‚Ü‚·B",-1,7,6,160,8
     LISTBOX         MIRROR_LIST,7,16,160,78,LBS_NOINTEGRALHEIGHT | LBS_EXTENDEDSEL | WS_VSCROLL | WS_TABSTOP
+    CONTROL         "ƒtƒ@ƒCƒ‹“à—e‚ð“]‘—‚µ‚È‚¢(&F)",MIRROR_NO_TRANSFER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,98,98,10
     DEFPUSHBUTTON   "ŽÀs",IDOK,7,153,50,14
     PUSHBUTTON      "ƒLƒƒƒ“ƒZƒ‹",IDCANCEL,62,153,50,14
     SCROLLBAR       MIRROR_SIZEGRIP,164,158,10,13,SBS_BOTTOMALIGN | SBS_VERT | SBS_SIZEGRIP
@@ -2223,7 +2226,7 @@ VS_VERSION_INFO VERSIONINFO
 BEGIN
     BLOCK "StringFileInfo"
     BEGIN
-        BLOCK "041104b0"
+        BLOCK "080004b0"
         BEGIN
             VALUE "Comments", "‚±‚ê‚̓tƒŠ[ƒ\ƒtƒgƒEƒGƒA‚Å‚·B"
             VALUE "CompanyName", "Sota, FFFTP Project"
@@ -2238,7 +2241,7 @@ BEGIN
     END
     BLOCK "VarFileInfo"
     BEGIN
-        VALUE "Translation", 0x411, 1200
+        VALUE "Translation", 0x800, 1200
     END
 END
 

--- a/Resource/resource.h
+++ b/Resource/resource.h
@@ -470,6 +470,7 @@
 #define HSET_NO_WEAK                    1226
 #define HOST_SET_DEFAULT                1227
 #define TRMODE_LISTERROR                1228
+#define MIRROR_NO_TRANSFER              1229
 #define MENU_END                        40001
 #define MENU_EXIT                       40001
 #define MENU_CONNECT                    40003
@@ -662,7 +663,7 @@
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_NEXT_RESOURCE_VALUE        199
 #define _APS_NEXT_COMMAND_VALUE         40182
-#define _APS_NEXT_CONTROL_VALUE         1229
+#define _APS_NEXT_CONTROL_VALUE         1230
 #define _APS_NEXT_SYMED_VALUE           101
 #endif
 #endif

--- a/Resource_eng/ffftp.rc
+++ b/Resource_eng/ffftp.rc
@@ -948,6 +948,8 @@ BEGIN
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,111,174,10
     CONTROL         "Confirm deletions during Mirror &Download",MIRROR_DOWNDEL_NOTIFY,
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,125,174,10
+    CONTROL         "Do not transfer &file contents during Mirroring",MIRROR_NO_TRANSFER,
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,139,174,10
 END
 
 somecmd_dlg DIALOG  0, 0, 187, 61
@@ -1142,6 +1144,7 @@ FONT 9, "MS Shell Dlg"
 BEGIN
     LTEXT           "Copy/Delete following files",-1,7,6,160,8
     LISTBOX         MIRROR_LIST,7,16,160,78,LBS_NOINTEGRALHEIGHT | LBS_EXTENDEDSEL | WS_VSCROLL | WS_TABSTOP
+    CONTROL         "Do not transfer &file contents",MIRROR_NO_TRANSFER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,98,98,10
     DEFPUSHBUTTON   "Start Now",IDOK,7,153,50,14
     PUSHBUTTON      "Cancel",IDCANCEL,62,153,50,14
     SCROLLBAR       MIRROR_SIZEGRIP,164,158,10,13,SBS_BOTTOMALIGN | SBS_VERT | SBS_SIZEGRIP
@@ -1157,8 +1160,9 @@ STYLE DS_LOCALEDIT | DS_SETFONT | WS_POPUP | WS_CLIPCHILDREN | WS_CAPTION | WS_S
 CAPTION "Mirror Download"
 FONT 9, "MS Shell Dlg"
 BEGIN
-    LTEXT           "Copy/Delete following files",-1,7,6,92,8
+    LTEXT           "Copy/Delete following files",-1,7,6,160,8
     LISTBOX         MIRROR_LIST,7,16,160,78,LBS_NOINTEGRALHEIGHT | LBS_EXTENDEDSEL | WS_VSCROLL | WS_TABSTOP
+    CONTROL         "Do not transfer &file contents",MIRROR_NO_TRANSFER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,98,98,10
     DEFPUSHBUTTON   "Start Now",IDOK,7,153,50,14
     PUSHBUTTON      "Cancel",IDCANCEL,62,153,50,14
     SCROLLBAR       MIRROR_SIZEGRIP,164,158,10,13,SBS_BOTTOMALIGN | SBS_VERT | SBS_SIZEGRIP
@@ -2259,7 +2263,7 @@ VS_VERSION_INFO VERSIONINFO
 BEGIN
     BLOCK "StringFileInfo"
     BEGIN
-        BLOCK "041104b0"
+        BLOCK "040904b0"
         BEGIN
             VALUE "Comments", "This software is Free Software"
             VALUE "CompanyName", "Sota, FFFTP Project"
@@ -2274,7 +2278,7 @@ BEGIN
     END
     BLOCK "VarFileInfo"
     BEGIN
-        VALUE "Translation", 0x411, 1200
+        VALUE "Translation", 0x409, 1200
     END
 END
 

--- a/Resource_eng/resource.h
+++ b/Resource_eng/resource.h
@@ -1,6 +1,6 @@
 //{{NO_DEPENDENCIES}}
 // Microsoft Visual C++ generated include file.
-// Used by FFFTP-eng.rc
+// Used by ffftp.rc
 //
 #define DELETE_ALL                      3
 #define DELETE_NO                       4
@@ -470,6 +470,7 @@
 #define HSET_NO_WEAK                    1226
 #define HOST_SET_DEFAULT                1227
 #define TRMODE_LISTERROR                1228
+#define MIRROR_NO_TRANSFER              1229
 #define MENU_END                        40001
 #define MENU_EXIT                       40001
 #define MENU_CONNECT                    40003
@@ -662,7 +663,7 @@
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_NEXT_RESOURCE_VALUE        199
 #define _APS_NEXT_COMMAND_VALUE         40182
-#define _APS_NEXT_CONTROL_VALUE         1229
+#define _APS_NEXT_CONTROL_VALUE         1230
 #define _APS_NEXT_SYMED_VALUE           101
 #endif
 #endif

--- a/common.h
+++ b/common.h
@@ -1159,6 +1159,8 @@ typedef struct transpacket {
 #endif
 	HWND hWndTrans;					/* 転送中ダイアログのウインドウハンドル */
 	int Abort;						/* 転送中止フラグ (ABORT_xxx) */
+	// ミラーリング設定追加
+	int NoTransfer;
 	// 同時接続対応
 	int ThreadCount;
 	struct transpacket *Next;

--- a/ftpproc.c
+++ b/ftpproc.c
@@ -112,6 +112,8 @@ extern int CancelFlg;
 extern int MakeAllDir;
 // ファイル一覧バグ修正
 extern int AbortOnListError;
+// ミラーリング設定追加
+extern int MirrorNoTransferContents; 
 
 /*===== ローカルなワーク =====*/
 
@@ -688,6 +690,8 @@ void MirrorDownloadProc(int Notify)
 						Pkt.KanjiCodeDesired = AskLocalKanjiCode();
 						Pkt.KanaCnv = AskHostKanaCnv();
 						Pkt.Mode = EXIST_OVW;
+						// ミラーリング設定追加
+						Pkt.NoTransfer = MirrorNoTransferContents;
 						AddTmpTransFileList(&Pkt, &Base);
 					}
 				}
@@ -1693,6 +1697,8 @@ void MirrorUploadProc(int Notify)
 						}
 #endif
 						Pkt.Mode = EXIST_OVW;
+						// ミラーリング設定追加
+						Pkt.NoTransfer = MirrorNoTransferContents;
 						AddTmpTransFileList(&Pkt, &Base);
 					}
 				}
@@ -1890,6 +1896,8 @@ static INT_PTR CALLBACK MirrorDispListCallBack(HWND hDlg, UINT iMessage, WPARAM
 			CountMirrorFiles(hDlg, *Base);
 			DlgSizeInit(hDlg, &DlgSize, &MirrorDlgSize);
 			EnableWindow(GetDlgItem(hDlg, MIRROR_DEL), FALSE);
+			// ミラーリング設定追加
+			SendDlgItemMessage(hDlg, MIRROR_NO_TRANSFER, BM_SETCHECK, MirrorNoTransferContents, 0);
 			return(TRUE);
 
 		case WM_COMMAND :
@@ -1934,6 +1942,17 @@ static INT_PTR CALLBACK MirrorDispListCallBack(HWND hDlg, UINT iMessage, WPARAM
 					}
 					break;
 
+				// ミラーリング設定追加
+				case MIRROR_NO_TRANSFER :
+					Pos = *Base;
+					while(Pos != NULL)
+					{
+						if(strncmp(Pos->Cmd, "STOR", 4) == 0 || strncmp(Pos->Cmd, "RETR", 4) == 0)
+							Pos->NoTransfer = SendDlgItemMessage(hDlg, MIRROR_NO_TRANSFER, BM_GETCHECK, 0, 0);
+						Pos = Pos->Next;
+					}
+					break;
+
 				case IDHELP :
 					hHelpWin = HtmlHelp(NULL, AskHelpFilePath(), HH_HELP_CONTEXT, IDH_HELP_TOPIC_0000012);
 			}

--- a/getput.c
+++ b/getput.c
@@ -84,6 +84,8 @@ static void DispTransPacket(TRANSPACKET *Pkt);
 static void EraseTransFileList(void);
 static ULONG WINAPI TransferThread(void *Dummy);
 static int MakeNonFullPath(TRANSPACKET *Pkt, char *CurDir, char *Tmp);
+// ミラーリング設定追加
+static int SetDownloadedFileTime(TRANSPACKET *Pkt);
 static int DownloadNonPassive(TRANSPACKET *Pkt, int *CancelCheckWork);
 static int DownloadPassive(TRANSPACKET *Pkt, int *CancelCheckWork);
 static int DownloadFile(TRANSPACKET *Pkt, SOCKET dSkt, int CreateMode, int *CancelCheckWork);
@@ -930,10 +932,20 @@ static ULONG WINAPI TransferThread(void *Dummy)
 //						{
 //							if(ReConnectTrnSkt() == FFFTP_SUCCESS)
 //								DoDownload(AskTrnCtrlSkt(), TransPacketBase, NO, &Canceled);
+						// ミラーリング設定追加
+						if(Pos->NoTransfer == NO)
+						{
 								Sts = DoDownload(TrnSkt, Pos, NO, &Canceled[Pos->ThreadCount]) / 100;
 								if(Sts != FTP_COMPLETE)
 									LastError = YES;
-//						}
+						}
+
+						// ミラーリング設定追加
+						if((SaveTimeStamp == YES) &&
+						   ((Pos->Time.dwLowDateTime != 0) || (Pos->Time.dwHighDateTime != 0)))
+						{
+							SetDownloadedFileTime(Pos);
+						}
 					}
 				}
 				// 一部TYPE、STOR(RETR)、PORT(PASV)を並列に処理できないホストがあるため
@@ -954,10 +966,13 @@ static ULONG WINAPI TransferThread(void *Dummy)
 //					{
 //						if(ReConnectTrnSkt() == FFFTP_SUCCESS)
 //							DoUpload(AskTrnCtrlSkt(), TransPacketBase);
+					// ミラーリング設定追加
+					if(Pos->NoTransfer == NO)
+					{
 							Sts = DoUpload(TrnSkt, Pos) / 100;
 							if(Sts != FTP_COMPLETE)
 								LastError = YES;
-//					}
+					}
 
 					// ホスト側の日時設定
 					/* ファイルのタイムスタンプを合わせる */
@@ -1347,6 +1362,21 @@ static int MakeNonFullPath(TRANSPACKET *Pkt, char *Cur, char *Tmp)
 
 
 
+// ミラーリング設定追加
+static int SetDownloadedFileTime(TRANSPACKET *Pkt)
+{
+	int Sts;
+	HANDLE hFile;
+	Sts = FFFTP_FAIL;
+	if((hFile = CreateFile(Pkt->LocalFile, GENERIC_WRITE | GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL)) != INVALID_HANDLE_VALUE)
+	{
+		if(SetFileTime(hFile, &Pkt->Time, &Pkt->Time, &Pkt->Time))
+			Sts = FFFTP_SUCCESS;
+		CloseHandle(hFile);
+	}
+	return Sts;
+}
+
 /*----- ダウンロードを行なう --------------------------------------------------
 *
 *	Parameter
@@ -2301,11 +2331,12 @@ static int DownloadFile(TRANSPACKET *Pkt, SOCKET dSkt, int CreateMode, int *Canc
 		}
 
 		/* ファイルのタイムスタンプを合わせる */
-		if((SaveTimeStamp == YES) &&
-		   ((Pkt->Time.dwLowDateTime != 0) || (Pkt->Time.dwHighDateTime != 0)))
-		{
-			SetFileTime(iFileHandle, &Pkt->Time, &Pkt->Time, &Pkt->Time);
-		}
+		// ミラーリング設定追加
+//		if((SaveTimeStamp == YES) &&
+//		   ((Pkt->Time.dwLowDateTime != 0) || (Pkt->Time.dwHighDateTime != 0)))
+//		{
+//			SetFileTime(iFileHandle, &Pkt->Time, &Pkt->Time, &Pkt->Time);
+//		}
 
 		CloseHandle(iFileHandle);
 

--- a/main.c
+++ b/main.c
@@ -285,6 +285,8 @@ int AutoCheckForUptatesInterval = 7;
 time_t LastAutoCheckForUpdates = 0;
 // ファイル一覧バグ修正
 int AbortOnListError = YES;
+// ミラーリング設定追加
+int MirrorNoTransferContents = NO; 
 
 
 

--- a/option.c
+++ b/option.c
@@ -194,6 +194,8 @@ extern int AutoApplyUpdates;
 extern int AutoCheckForUptatesInterval;
 // ファイル一覧バグ修正
 extern int AbortOnListError;
+// ミラーリング設定追加
+extern int MirrorNoTransferContents; 
 
 
 /*----- オプションのプロパティシート ------------------------------------------
@@ -1010,7 +1012,8 @@ static INT_PTR CALLBACK MirrorSettingProc(HWND hDlg, UINT message, WPARAM wParam
 			SetMultiTextToList(hDlg, MIRROR_NODEL_LIST, MirrorNoDel);
 			SendDlgItemMessage(hDlg, MIRROR_LOW, BM_SETCHECK, MirrorFnameCnv, 0);
 			SendDlgItemMessage(hDlg, MIRROR_UPDEL_NOTIFY, BM_SETCHECK, MirUpDelNotify, 0);
-			SendDlgItemMessage(hDlg, MIRROR_DOWNDEL_NOTIFY, BM_SETCHECK, MirDownDelNotify, 0);
+			// ミラーリング設定追加
+			SendDlgItemMessage(hDlg, MIRROR_NO_TRANSFER, BM_SETCHECK, MirrorNoTransferContents, 0);
 		    return(TRUE);
 
 		case WM_NOTIFY:
@@ -1023,6 +1026,8 @@ static INT_PTR CALLBACK MirrorSettingProc(HWND hDlg, UINT message, WPARAM wParam
 					MirrorFnameCnv = SendDlgItemMessage(hDlg, MIRROR_LOW, BM_GETCHECK, 0, 0);
 					MirUpDelNotify = SendDlgItemMessage(hDlg, MIRROR_UPDEL_NOTIFY, BM_GETCHECK, 0, 0);
 					MirDownDelNotify = SendDlgItemMessage(hDlg, MIRROR_DOWNDEL_NOTIFY, BM_GETCHECK, 0, 0);
+					// ミラーリング設定追加
+					MirrorNoTransferContents = SendDlgItemMessage(hDlg, MIRROR_NO_TRANSFER, BM_GETCHECK, 0, 0);
 					break;
 
 				case PSN_RESET :

--- a/registry.c
+++ b/registry.c
@@ -239,6 +239,8 @@ extern int AutoCheckForUptatesInterval;
 extern time_t LastAutoCheckForUpdates;
 // ファイル一覧バグ修正
 extern int AbortOnListError;
+// ミラーリング設定追加
+extern int MirrorNoTransferContents; 
 
 /*----- マスタパスワードの設定 ----------------------------------------------
 *
@@ -841,6 +843,8 @@ void SaveRegistry(void)
 				WriteBinaryToReg(hKey4, "UpdLastCheck", &LastAutoCheckForUpdates, sizeof(LastAutoCheckForUpdates));
 				// ファイル一覧バグ修正
 				WriteIntValueToReg(hKey4, "AbortListErr", AbortOnListError);
+				// ミラーリング設定追加
+				WriteIntValueToReg(hKey4, "MirNoTransfer", MirrorNoTransferContents);
 			}
 			CloseSubKey(hKey4);
 		}
@@ -1426,6 +1430,8 @@ int LoadRegistry(void)
 			ReadBinaryFromReg(hKey4, "UpdLastCheck", &LastAutoCheckForUpdates, sizeof(LastAutoCheckForUpdates));
 			// ファイル一覧バグ修正
 			ReadIntValueFromReg(hKey4, "AbortListErr", &AbortOnListError);
+			// ミラーリング設定追加
+			ReadIntValueFromReg(hKey4, "MirNoTransfer", &MirrorNoTransferContents);
 
 			CloseSubKey(hKey4);
 		}