提交: 8ef4e07fd1e721b0181b517444b4dffc859e9c09 - ffftp (git)

Loweynet

Commit MetaInfo

• 修订版: 8ef4e07fd1e721b0181b517444b4dffc859e9c09 (tree)
• 时间: 2012-01-27 21:41:03
• 作者: s_kawamoto <s_kawamoto@user...>
• Commiter: s_kawamoto

Log Message

Enhance routines for extra commands.

更改概述

• modified: FFFTP_Eng_Release/FFFTP.exe
• modified: Release/FFFTP.exe
• modified: common.h
• modified: connect.c
• modified: ftpproc.c
• modified: remote.c

差异

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/common.h
+++ b/common.h
@@ -1601,7 +1601,7 @@ int DoSIZE(SOCKET cSkt, char *Path, LONGLONG *Size, int *CancelCheckWork);
 int DoMDTM(SOCKET cSkt, char *Path, FILETIME *Time, int *CancelCheckWork);
 // 同時接続対応
 //int DoQUOTE(char *CmdStr);
-int DoQUOTE(SOCKET cSkt, char *CmdStr);
+int DoQUOTE(SOCKET cSkt, char *CmdStr, int *CancelCheckWork);
 SOCKET DoClose(SOCKET Sock);
 int DoQUIT(SOCKET ctrl_skt);
 int DoDirListCmdSkt(char *AddOpt, char *Path, int Num, int *CancelCheckWork);

--- a/connect.c
+++ b/connect.c
@@ -59,7 +59,7 @@
 static INT_PTR CALLBACK QuickConDialogCallBack(HWND hDlg, UINT iMessage, WPARAM wParam, LPARAM lParam);
 // 同時接続対応
 //static int SendInitCommand(char *Cmd);
-static int SendInitCommand(SOCKET Socket, char *Cmd);
+static int SendInitCommand(SOCKET Socket, char *Cmd, int *CancelCheckWork);
 static void AskUseFireWall(char *Host, int *Fire, int *Pasv, int *List);
 static void SaveCurrentSetToHistory(void);
 static int ReConnectSkt(SOCKET *Skt);
@@ -240,7 +240,7 @@ void ConnectProc(int Type, int Num)
 				DispWindowTitle();
 				SoundPlay(SND_CONNECT);
 
-				SendInitCommand(CmdCtrlSocket, CurHost.InitCmd);
+				SendInitCommand(CmdCtrlSocket, CurHost.InitCmd, &CancelFlg);
 
 				if(strlen(CurHost.LocalInitDir) > 0)
 				{
@@ -611,7 +611,7 @@ void HistoryConnectProc(int MenuCmd)
 				DispWindowTitle();
 				SoundPlay(SND_CONNECT);
 
-				SendInitCommand(CmdCtrlSocket, CurHost.InitCmd);
+				SendInitCommand(CmdCtrlSocket, CurHost.InitCmd, &CancelFlg);
 
 				DoLocalCWD(CurHost.LocalInitDir);
 				GetLocalDirForWnd();
@@ -650,7 +650,9 @@ void HistoryConnectProc(int MenuCmd)
 *			cmd1\r\ncmd2\r\n\0
 *----------------------------------------------------------------------------*/
 
-static int SendInitCommand(SOCKET Socket, char *Cmd)
+// 同時接続対応
+//static int SendInitCommand(char *Cmd)
+static int SendInitCommand(SOCKET Socket, char *Cmd, int *CancelCheckWork)
 {
 	char Tmp[INITCMD_LEN+1];
 	char *Pos;
@@ -661,7 +663,8 @@ static int SendInitCommand(SOCKET Socket, char *Cmd)
 		if((Pos = strchr(Tmp, '\r')) != NULL)
 			*Pos = NUL;
 		if(strlen(Tmp) > 0)
-			DoQUOTE(Socket, Tmp);
+//			DoQUOTE(Tmp);
+			DoQUOTE(Socket, Tmp, CancelCheckWork);
 
 		if((Cmd = strchr(Cmd, '\n')) != NULL)
 			Cmd++;
@@ -1108,7 +1111,7 @@ int ReConnectTrnSkt(SOCKET *Skt, int *CancelCheckWork)
 //	if((*Skt = DoConnect(CurHost.HostAdrs, CurHost.UserName, CurHost.PassWord, CurHost.Account, CurHost.Port, CurHost.FireWall, NO, CurHost.Security)) != INVALID_SOCKET)
 	if((*Skt = DoConnect(&HostData, CurHost.HostAdrs, CurHost.UserName, CurHost.PassWord, CurHost.Account, CurHost.Port, CurHost.FireWall, NO, CurHost.Security, CancelCheckWork)) != INVALID_SOCKET)
 	{
-		SendInitCommand(*Skt, CurHost.InitCmd);
+		SendInitCommand(*Skt, CurHost.InitCmd, CancelCheckWork);
 //		AskRemoteCurDir(Path, FMAX_PATH);
 //		DoCWD(Path, YES, YES, YES);
 		Sts = FFFTP_SUCCESS;
@@ -1150,7 +1153,7 @@ static int ReConnectSkt(SOCKET *Skt)
 //	if((*Skt = DoConnect(CurHost.HostAdrs, CurHost.UserName, CurHost.PassWord, CurHost.Account, CurHost.Port, CurHost.FireWall, NO, CurHost.Security)) != INVALID_SOCKET)
 	if((*Skt = DoConnect(&CurHost, CurHost.HostAdrs, CurHost.UserName, CurHost.PassWord, CurHost.Account, CurHost.Port, CurHost.FireWall, NO, CurHost.Security, &CancelFlg)) != INVALID_SOCKET)
 	{
-		SendInitCommand(*Skt, CurHost.InitCmd);
+		SendInitCommand(*Skt, CurHost.InitCmd, &CancelFlg);
 		AskRemoteCurDir(Path, FMAX_PATH);
 		DoCWD(Path, YES, YES, YES);
 		Sts = FFFTP_SUCCESS;

--- a/ftpproc.c
+++ b/ftpproc.c
@@ -3075,7 +3075,7 @@ void SomeCmdProc(void)
 			{
 				// 同時接続対応
 				//DoQUOTE(Cmd);
-				DoQUOTE(AskCmdCtrlSkt(), Cmd);
+				DoQUOTE(AskCmdCtrlSkt(), Cmd, &CancelFlg);
 			}
 			EnableUserOpe();
 		}

--- a/remote.c
+++ b/remote.c
@@ -470,12 +470,12 @@ int DoMDTM(SOCKET cSkt, char *Path, FILETIME *Time, int *CancelCheckWork)
 
 // 同時接続対応
 //int DoQUOTE(char *CmdStr)
-int DoQUOTE(SOCKET cSkt, char *CmdStr)
+int DoQUOTE(SOCKET cSkt, char *CmdStr, int *CancelCheckWork)
 {
-	int Sts, CancelCheckWork;
+	int Sts;
 
-	CancelCheckWork = NO;
-	Sts = CommandProcTrn(cSkt, NULL, &CancelCheckWork, "%s", CmdStr);
+//	Sts = CommandProcCmd(NULL, "%s", CmdStr);
+	Sts = CommandProcTrn(cSkt, NULL, CancelCheckWork, "%s", CmdStr);
 
 	if(Sts/100 >= FTP_CONTINUE)
 		SoundPlay(SND_ERROR);
@@ -704,10 +704,10 @@ void SwitchOSSProc(void)
 
 	/* DoPWD でノード名の \ を保存するために OSSフラグも変更する */
 	if(AskOSS() == YES) {
-		DoQUOTE(AskCmdCtrlSkt(), "GUARDIAN");
+		DoQUOTE(AskCmdCtrlSkt(), "GUARDIAN", &CancelFlg);
 		SetOSS(NO);
 	} else {
-		DoQUOTE(AskCmdCtrlSkt(), "OSS");
+		DoQUOTE(AskCmdCtrlSkt(), "OSS", &CancelFlg);
 		SetOSS(YES);
 	}
 	/* Current Dir 再取得 */