Modify documents.

[ffftp/ffftp.git] / remote.c

diff --git a/remote.c b/remote.c
index bc80b07..30a75fe 100644 (file)
--- a/remote.c
+++ b/remote.c
@@ -441,8 +441,11 @@ int DoMDTM(SOCKET cSkt, char *Path, FILETIME *Time, int *CancelCheckWork)
     Time->dwHighDateTime = 0;\r
 \r
        // 同時接続対応\r
+       // ホスト側の日時取得\r
 //     Sts = CommandProcTrn(Tmp, "MDTM %s", Path);\r
-       Sts = CommandProcTrn(cSkt, Tmp, CancelCheckWork, "MDTM %s", Path);\r
+       Sts = 500;\r
+       if(AskHostFeature() & FEATURE_MDTM)\r
+               Sts = CommandProcTrn(cSkt, Tmp, CancelCheckWork, "MDTM %s", Path);\r
        if(Sts/100 == FTP_COMPLETE)\r
        {\r
                sTime.wMilliseconds = 0;\r
@@ -451,7 +454,8 @@ int DoMDTM(SOCKET cSkt, char *Path, FILETIME *Time, int *CancelCheckWork)
                        &sTime.wHour, &sTime.wMinute, &sTime.wSecond) == 6)\r
                {\r
                        SystemTimeToFileTime(&sTime, Time);\r
-                       SpecificLocalFileTime2FileTime(Time, AskHostTimeZone());\r
+                       // 時刻はGMT\r
+//                     SpecificLocalFileTime2FileTime(Time, AskHostTimeZone());\r
 \r
                }\r
        }\r
@@ -459,6 +463,22 @@ int DoMDTM(SOCKET cSkt, char *Path, FILETIME *Time, int *CancelCheckWork)
 }\r
 \r
 \r
+// ホスト側の日時設定\r
+int DoMFMT(SOCKET cSkt, char *Path, FILETIME *Time, int *CancelCheckWork)\r
+{\r
+       int Sts;\r
+       char Tmp[1024];\r
+       SYSTEMTIME sTime;\r
+\r
+       FileTimeToSystemTime(Time, &sTime);\r
+\r
+       Sts = 500;\r
+       if(AskHostFeature() & FEATURE_MFMT)\r
+               Sts = CommandProcTrn(cSkt, Tmp, CancelCheckWork, "MFMT %04d%02d%02d%02d%02d%02d %s", sTime.wYear, sTime.wMonth, sTime.wDay, sTime.wHour, sTime.wMinute, sTime.wSecond, Path);\r
+       return(Sts/100);\r
+}\r
+\r
+\r
 /*----- リモート側のコマンドを実行 --------------------------------------------\r
 *\r
 *      Parameter\r
@@ -468,11 +488,14 @@ int DoMDTM(SOCKET cSkt, char *Path, FILETIME *Time, int *CancelCheckWork)
 *              int 応答コードの１桁目\r
 *----------------------------------------------------------------------------*/\r
 \r
-int DoQUOTE(char *CmdStr)\r
+// 同時接続対応\r
+//int DoQUOTE(char *CmdStr)\r
+int DoQUOTE(SOCKET cSkt, char *CmdStr, int *CancelCheckWork)\r
 {\r
        int Sts;\r
 \r
-       Sts = CommandProcCmd(NULL, "%s", CmdStr);\r
+//     Sts = CommandProcCmd(NULL, "%s", CmdStr);\r
+       Sts = CommandProcTrn(cSkt, NULL, CancelCheckWork, "%s", CmdStr);\r
 \r
        if(Sts/100 >= FTP_CONTINUE)\r
                SoundPlay(SND_ERROR);\r
@@ -519,7 +542,9 @@ SOCKET DoClose(SOCKET Sock)
 *              int 応答コードの１桁目\r
 *----------------------------------------------------------------------------*/\r
 \r
-int DoQUIT(SOCKET ctrl_skt)\r
+// 同時接続対応\r
+//int DoQUIT(SOCKET ctrl_skt)\r
+int DoQUIT(SOCKET ctrl_skt, int *CancelCheckWork)\r
 {\r
        int Ret;\r
 \r
@@ -527,7 +552,7 @@ int DoQUIT(SOCKET ctrl_skt)
        if(SendQuit == YES)\r
                // 同時接続対応\r
 //             Ret = command(ctrl_skt, NULL, &CheckCancelFlg, "QUIT") / 100;\r
-               Ret = command(ctrl_skt, NULL, &CancelFlg, "QUIT") / 100;\r
+               Ret = command(ctrl_skt, NULL, CancelCheckWork, "QUIT") / 100;\r
 \r
        return(Ret);\r
 }\r
@@ -633,7 +658,7 @@ static int DoDirList(HWND hWnd, SOCKET cSkt, char *AddOpt, char *Path, int Num,
        MainTransPkt.hWndTrans = hWnd;\r
        MainTransPkt.Next = NULL;\r
 \r
-       Sts = DoDownLoad(cSkt, &MainTransPkt, YES, CancelCheckWork);\r
+       Sts = DoDownload(cSkt, &MainTransPkt, YES, CancelCheckWork);\r
 \r
 //#pragma aaa\r
 //DoPrintf("===== DoDirList Done.");\r
@@ -701,10 +726,10 @@ void SwitchOSSProc(void)
 \r
        /* DoPWD でノード名の \ を保存するために OSSフラグも変更する */\r
        if(AskOSS() == YES) {\r
-               DoQUOTE("GUARDIAN");\r
+               DoQUOTE(AskCmdCtrlSkt(), "GUARDIAN", &CancelFlg);\r
                SetOSS(NO);\r
        } else {\r
-               DoQUOTE("OSS");\r
+               DoQUOTE(AskCmdCtrlSkt(), "OSS", &CancelFlg);\r
                SetOSS(YES);\r
        }\r
        /* Current Dir 再取得 */\r
@@ -721,7 +746,9 @@ void SwitchOSSProc(void)
 /*----- リモート側へコマンドを送りリプライを待つ（転送ソケット）---------------\r
 *\r
 *      Parameter\r
+*              SOCKET cSkt : ソケット\r
 *              char *Reply : リプライのコピー先 (NULL=コピーしない)\r
+*              int *CancelCheckWork :\r
 *              char *fmt : フォーマット文字列\r
 *              ... : パラメータ\r
 *\r