X-Git-Url: http://git.sourceforge.jp/view?p=ffftp%2Fffftp.git;a=blobdiff_plain;f=connect.c;h=3e17909f239f171b0911d7d42e4ce65bae9314b6;hp=db97a5889deda245012edfb229c1566b981f98b4;hb=2bffe82de6811b380d280099f638dd7b4cbb3404;hpb=2ee418d5d0095069672ab0de6c01ae07336756e0

diff --git a/connect.c b/connect.c
index db97a58..3e17909 100644
--- 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, int *CancelCheckWork);
 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, &CancelFlg);
 
 				if(strlen(CurHost.LocalInitDir) > 0)
 				{
@@ -609,7 +611,7 @@ void HistoryConnectProc(int MenuCmd)
 				DispWindowTitle();
 				SoundPlay(SND_CONNECT);
 
-				SendInitCommand(CurHost.InitCmd);
+				SendInitCommand(CmdCtrlSocket, CurHost.InitCmd, &CancelFlg);
 
 				DoLocalCWD(CurHost.LocalInitDir);
 				GetLocalDirForWnd();
@@ -648,7 +650,9 @@ void HistoryConnectProc(int MenuCmd)
 *			cmd1\r\ncmd2\r\n\0
 *----------------------------------------------------------------------------*/
 
-static int SendInitCommand(char *Cmd)
+// 同時接続対応
+//static int SendInitCommand(char *Cmd)
+static int SendInitCommand(SOCKET Socket, char *Cmd, int *CancelCheckWork)
 {
 	char Tmp[INITCMD_LEN+1];
 	char *Pos;
@@ -659,7 +663,8 @@ static int SendInitCommand(char *Cmd)
 		if((Pos = strchr(Tmp, '\r')) != NULL)
 			*Pos = NUL;
 		if(strlen(Tmp) > 0)
-			DoQUOTE(Tmp);
+//			DoQUOTE(Tmp);
+			DoQUOTE(Socket, Tmp, CancelCheckWork);
 
 		if((Cmd = strchr(Cmd, '\n')) != NULL)
 			Cmd++;
@@ -1106,6 +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, CancelCheckWork);
 //		AskRemoteCurDir(Path, FMAX_PATH);
 //		DoCWD(Path, YES, YES, YES);
 		Sts = FFFTP_SUCCESS;
@@ -1147,6 +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, &CancelFlg);
 		AskRemoteCurDir(Path, FMAX_PATH);
 		DoCWD(Path, YES, YES, YES);
 		Sts = FFFTP_SUCCESS;
@@ -1356,6 +1363,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);
 }