Commit: 588770f0bf195f785550d1066c747839530d2d24 - ffftp (git)

FFFTPのソースコードです。

Commit MetaInfo

• Revision: 588770f0bf195f785550d1066c747839530d2d24 (tree)
• Zeit: 2012-01-26 12:37:07
• Autor: Yuji Tanaka <chibi_honu@user...>
• Commiter: Yuji Tanaka

Log Message

Fix bugs of InitCmd and simultaneous connection.

Ändern Zusammenfassung

• modified: common.h
• modified: connect.c
• modified: ftpproc.c
• modified: remote.c

Diff

--- a/common.h
+++ b/common.h
@@ -1599,7 +1599,9 @@ int DoSIZE(SOCKET cSkt, char *Path, LONGLONG *Size, int *CancelCheckWork);
 // 同時接続対応
 //int DoMDTM(char *Path, FILETIME *Time);
 int DoMDTM(SOCKET cSkt, char *Path, FILETIME *Time, int *CancelCheckWork);
-int DoQUOTE(char *CmdStr);
+// 同時接続対応
+//int DoQUOTE(char *CmdStr);
+int DoQUOTE(SOCKET cSkt, char *CmdStr);
 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
@@ -57,7 +57,9 @@
 // 64ビット対応
 //static BOOL CALLBACK QuickConDialogCallBack(HWND hDlg, UINT iMessage, WPARAM wParam, LPARAM lParam);
 static INT_PTR CALLBACK QuickConDialogCallBack(HWND hDlg, UINT iMessage, WPARAM wParam, LPARAM lParam);
-static int SendInitCommand(char *Cmd);
+// 同時接続対応
+//static int SendInitCommand(char *Cmd);
+static int SendInitCommand(SOCKET Socket, char *Cmd);
 static void AskUseFireWall(char *Host, int *Fire, int *Pasv, int *List);
 static void SaveCurrentSetToHistory(void);
 static int ReConnectSkt(SOCKET *Skt);
@@ -238,7 +240,7 @@ void ConnectProc(int Type, int Num)
 				DispWindowTitle();
 				SoundPlay(SND_CONNECT);
 
-				SendInitCommand(CurHost.InitCmd);
+				SendInitCommand(CmdCtrlSocket, CurHost.InitCmd);
 
 				if(strlen(CurHost.LocalInitDir) > 0)
 				{
@@ -609,7 +611,7 @@ void HistoryConnectProc(int MenuCmd)
 				DispWindowTitle();
 				SoundPlay(SND_CONNECT);
 
-				SendInitCommand(CurHost.InitCmd);
+				SendInitCommand(CmdCtrlSocket, CurHost.InitCmd);
 
 				DoLocalCWD(CurHost.LocalInitDir);
 				GetLocalDirForWnd();
@@ -648,7 +650,7 @@ void HistoryConnectProc(int MenuCmd)
 *			cmd1\r\ncmd2\r\n\0
 *----------------------------------------------------------------------------*/
 
-static int SendInitCommand(char *Cmd)
+static int SendInitCommand(SOCKET Socket, char *Cmd)
 {
 	char Tmp[INITCMD_LEN+1];
 	char *Pos;
@@ -659,7 +661,7 @@ static int SendInitCommand(char *Cmd)
 		if((Pos = strchr(Tmp, '\r')) != NULL)
 			*Pos = NUL;
 		if(strlen(Tmp) > 0)
-			DoQUOTE(Tmp);
+			DoQUOTE(Socket, Tmp);
 
 		if((Cmd = strchr(Cmd, '\n')) != NULL)
 			Cmd++;
@@ -1106,7 +1108,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(CurHost.InitCmd);
+		SendInitCommand(*Skt, CurHost.InitCmd);
 //		AskRemoteCurDir(Path, FMAX_PATH);
 //		DoCWD(Path, YES, YES, YES);
 		Sts = FFFTP_SUCCESS;
@@ -1148,7 +1150,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(CurHost.InitCmd);
+		SendInitCommand(*Skt, CurHost.InitCmd);
 		AskRemoteCurDir(Path, FMAX_PATH);
 		DoCWD(Path, YES, YES, YES);
 		Sts = FFFTP_SUCCESS;
@@ -1358,6 +1360,13 @@ int AskRealHostType(void)
 
 int SetOSS(int wkOss)
 {
+	if(Oss != wkOss) {
+		if (wkOss == YES) {
+			strcpy(CurHost.InitCmd, "OSS");
+		} else {
+			strcpy(CurHost.InitCmd, "GUARDIAN");
+		}
+	}
 	Oss = wkOss;
 	return(Oss);
 }

--- a/ftpproc.c
+++ b/ftpproc.c
@@ -3073,7 +3073,9 @@ void SomeCmdProc(void)
 
 			if(InputDialogBox(somecmd_dlg, GetMainHwnd(), NULL, Cmd, 81, &Tmp, IDH_HELP_TOPIC_0000023) == YES)
 			{
-				DoQUOTE(Cmd);
+				// 同時接続対応
+				//DoQUOTE(Cmd);
+				DoQUOTE(AskCmdCtrlSkt(), Cmd);
 			}
 			EnableUserOpe();
 		}

--- a/remote.c
+++ b/remote.c
@@ -468,11 +468,14 @@ int DoMDTM(SOCKET cSkt, char *Path, FILETIME *Time, int *CancelCheckWork)
 *		int 応答コードの１桁目
 *----------------------------------------------------------------------------*/
 
-int DoQUOTE(char *CmdStr)
+// 同時接続対応
+//int DoQUOTE(char *CmdStr)
+int DoQUOTE(SOCKET cSkt, char *CmdStr)
 {
-	int Sts;
+	int Sts, CancelCheckWork;
 
-	Sts = CommandProcCmd(NULL, "%s", CmdStr);
+	CancelCheckWork = NO;
+	Sts = CommandProcTrn(cSkt, NULL, &CancelCheckWork, "%s", CmdStr);
 
 	if(Sts/100 >= FTP_CONTINUE)
 		SoundPlay(SND_ERROR);
@@ -701,10 +704,10 @@ void SwitchOSSProc(void)
 
 	/* DoPWD でノード名の \ を保存するために OSSフラグも変更する */
 	if(AskOSS() == YES) {
-		DoQUOTE("GUARDIAN");
+		DoQUOTE(AskCmdCtrlSkt(), "GUARDIAN");
 		SetOSS(NO);
 	} else {
-		DoQUOTE("OSS");
+		DoQUOTE(AskCmdCtrlSkt(), "OSS");
 		SetOSS(YES);
 	}
 	/* Current Dir 再取得 */
@@ -721,7 +724,9 @@ void SwitchOSSProc(void)
 /*----- リモート側へコマンドを送りリプライを待つ（転送ソケット）---------------
 *
 *	Parameter
+*		SOCKET cSkt : ソケット
 *		char *Reply : リプライのコピー先 (NULL=コピーしない)
+*		int *CancelCheckWork :
 *		char *fmt : フォーマット文字列
 *		... : パラメータ
 *