OSDN Git Service

Fix bugs of mirroring transfer.
authors_kawamoto <s_kawamoto@users.sourceforge.jp>
Fri, 16 Jan 2015 15:55:00 +0000 (00:55 +0900)
committers_kawamoto <s_kawamoto@users.sourceforge.jp>
Fri, 16 Jan 2015 15:55:00 +0000 (00:55 +0900)
FFFTP_Eng_Release/FFFTP.exe
FFFTP_Eng_Release_64/FFFTP.exe
Release/FFFTP.exe
Release_64/FFFTP.exe
ftpproc.c
main.c
remote.c

index e20cfeb..5b28dd9 100644 (file)
Binary files a/FFFTP_Eng_Release/FFFTP.exe and b/FFFTP_Eng_Release/FFFTP.exe differ
index a080691..ed642cb 100644 (file)
Binary files a/FFFTP_Eng_Release_64/FFFTP.exe and b/FFFTP_Eng_Release_64/FFFTP.exe differ
index 757ce3f..12dede5 100644 (file)
Binary files a/Release/FFFTP.exe and b/Release/FFFTP.exe differ
index a6e33e3..18cf00a 100644 (file)
Binary files a/Release_64/FFFTP.exe and b/Release_64/FFFTP.exe differ
index e0a9240..f1fa2ea 100644 (file)
--- a/ftpproc.c
+++ b/ftpproc.c
@@ -299,6 +299,8 @@ void DownloadProc(int ChName, int ForceFile, int All)
                                // ディレクトリ自動作成\r
                                strcpy(Tmp, Pkt.LocalFile);\r
                                Pkt.Mode = CheckLocalFile(&Pkt);        /* Pkt.ExistSize がセットされる */\r
+                               // ミラーリング設定追加\r
+                               Pkt.NoTransfer = NO;\r
                                if(Pkt.Mode == EXIST_ABORT)\r
                                        break;\r
                                else if(Pkt.Mode != EXIST_IGNORE)\r
@@ -419,6 +421,8 @@ void DirectDownloadProc(char *Fname)
                                // ディレクトリ自動作成\r
                                strcpy(Tmp, Pkt.LocalFile);\r
                                Pkt.Mode = CheckLocalFile(&Pkt);        /* Pkt.ExistSize がセットされる */\r
+                               // ミラーリング設定追加\r
+                               Pkt.NoTransfer = NO;\r
                                if((Pkt.Mode != EXIST_ABORT) && (Pkt.Mode != EXIST_IGNORE))\r
                                // ディレクトリ自動作成\r
 //                                     AddTransFileList(&Pkt);\r
@@ -1221,6 +1225,8 @@ void UploadListProc(int ChName, int All)
                                // ディレクトリ自動作成\r
                                strcpy(Tmp, Pkt.RemoteFile);\r
                                Pkt.Mode = CheckRemoteFile(&Pkt, RemoteList);\r
+                               // ミラーリング設定追加\r
+                               Pkt.NoTransfer = NO;\r
                                if(Pkt.Mode == EXIST_ABORT)\r
                                        break;\r
                                else if(Pkt.Mode != EXIST_IGNORE)\r
@@ -1402,6 +1408,8 @@ void UploadDragProc(WPARAM wParam)
                                // ディレクトリ自動作成\r
                                strcpy(Tmp, Pkt.RemoteFile);\r
                                Pkt.Mode = CheckRemoteFile(&Pkt, RemoteList);\r
+                               // ミラーリング設定追加\r
+                               Pkt.NoTransfer = NO;\r
                                if(Pkt.Mode == EXIST_ABORT)\r
                                        break;\r
                                else if(Pkt.Mode != EXIST_IGNORE)\r
diff --git a/main.c b/main.c
index f927ab9..7e83032 100644 (file)
--- a/main.c
+++ b/main.c
@@ -2668,6 +2668,8 @@ void DoubleClickProc(int Win, int Mode, int App)
                                                        MainTransPkt.KanjiCodeDesired = AskLocalKanjiCode();\r
                                                        MainTransPkt.KanaCnv = AskHostKanaCnv();\r
                                                        MainTransPkt.Mode = EXIST_OVW;\r
+                                                       // ミラーリング設定追加\r
+                                                       MainTransPkt.NoTransfer = NO;\r
                                                        MainTransPkt.ExistSize = 0;\r
                                                        MainTransPkt.hWndTrans = NULL;\r
                                                        MainTransPkt.Next = NULL;\r
index 11da566..4f7f7f7 100644 (file)
--- a/remote.c
+++ b/remote.c
@@ -711,6 +711,8 @@ static int DoDirList(HWND hWnd, SOCKET cSkt, char *AddOpt, char *Path, int Num,
        MainTransPkt.KanjiCode = KANJI_NOCNV;\r
        MainTransPkt.KanaCnv = YES;\r
        MainTransPkt.Mode = EXIST_OVW;\r
+       // ミラーリング設定追加\r
+       MainTransPkt.NoTransfer = NO;\r
        MainTransPkt.ExistSize = 0;\r
        MainTransPkt.hWndTrans = hWnd;\r
        MainTransPkt.Next = NULL;\r