static INT_PTR CALLBACK QuickConDialogCallBack(HWND hDlg, UINT iMessage, WPARAM wParam, LPARAM lParam);\r
// 同時接続対応\r
//static int SendInitCommand(char *Cmd);\r
-static int SendInitCommand(SOCKET Socket, char *Cmd);\r
+static int SendInitCommand(SOCKET Socket, char *Cmd, int *CancelCheckWork);\r
static void AskUseFireWall(char *Host, int *Fire, int *Pasv, int *List);\r
static void SaveCurrentSetToHistory(void);\r
static int ReConnectSkt(SOCKET *Skt);\r
DispWindowTitle();\r
SoundPlay(SND_CONNECT);\r
\r
- SendInitCommand(CmdCtrlSocket, CurHost.InitCmd);\r
+ SendInitCommand(CmdCtrlSocket, CurHost.InitCmd, &CancelFlg);\r
\r
if(strlen(CurHost.LocalInitDir) > 0)\r
{\r
DispWindowTitle();\r
SoundPlay(SND_CONNECT);\r
\r
- SendInitCommand(CmdCtrlSocket, CurHost.InitCmd);\r
+ SendInitCommand(CmdCtrlSocket, CurHost.InitCmd, &CancelFlg);\r
\r
DoLocalCWD(CurHost.LocalInitDir);\r
GetLocalDirForWnd();\r
* cmd1\r\ncmd2\r\n\0\r
*----------------------------------------------------------------------------*/\r
\r
-static int SendInitCommand(SOCKET Socket, char *Cmd)\r
+// 同時接続対応\r
+//static int SendInitCommand(char *Cmd)\r
+static int SendInitCommand(SOCKET Socket, char *Cmd, int *CancelCheckWork)\r
{\r
char Tmp[INITCMD_LEN+1];\r
char *Pos;\r
if((Pos = strchr(Tmp, '\r')) != NULL)\r
*Pos = NUL;\r
if(strlen(Tmp) > 0)\r
- DoQUOTE(Socket, Tmp);\r
+// DoQUOTE(Tmp);\r
+ DoQUOTE(Socket, Tmp, CancelCheckWork);\r
\r
if((Cmd = strchr(Cmd, '\n')) != NULL)\r
Cmd++;\r
// if((*Skt = DoConnect(CurHost.HostAdrs, CurHost.UserName, CurHost.PassWord, CurHost.Account, CurHost.Port, CurHost.FireWall, NO, CurHost.Security)) != INVALID_SOCKET)\r
if((*Skt = DoConnect(&HostData, CurHost.HostAdrs, CurHost.UserName, CurHost.PassWord, CurHost.Account, CurHost.Port, CurHost.FireWall, NO, CurHost.Security, CancelCheckWork)) != INVALID_SOCKET)\r
{\r
- SendInitCommand(*Skt, CurHost.InitCmd);\r
+ SendInitCommand(*Skt, CurHost.InitCmd, CancelCheckWork);\r
// AskRemoteCurDir(Path, FMAX_PATH);\r
// DoCWD(Path, YES, YES, YES);\r
Sts = FFFTP_SUCCESS;\r
// if((*Skt = DoConnect(CurHost.HostAdrs, CurHost.UserName, CurHost.PassWord, CurHost.Account, CurHost.Port, CurHost.FireWall, NO, CurHost.Security)) != INVALID_SOCKET)\r
if((*Skt = DoConnect(&CurHost, CurHost.HostAdrs, CurHost.UserName, CurHost.PassWord, CurHost.Account, CurHost.Port, CurHost.FireWall, NO, CurHost.Security, &CancelFlg)) != INVALID_SOCKET)\r
{\r
- SendInitCommand(*Skt, CurHost.InitCmd);\r
+ SendInitCommand(*Skt, CurHost.InitCmd, &CancelFlg);\r
AskRemoteCurDir(Path, FMAX_PATH);\r
DoCWD(Path, YES, YES, YES);\r
Sts = FFFTP_SUCCESS;\r
\r
// 同時接続対応\r
//int DoQUOTE(char *CmdStr)\r
-int DoQUOTE(SOCKET cSkt, char *CmdStr)\r
+int DoQUOTE(SOCKET cSkt, char *CmdStr, int *CancelCheckWork)\r
{\r
- int Sts, CancelCheckWork;\r
+ int Sts;\r
\r
- CancelCheckWork = NO;\r
- Sts = CommandProcTrn(cSkt, NULL, &CancelCheckWork, "%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
\r
/* DoPWD でノード名の \ を保存するために OSSフラグも変更する */\r
if(AskOSS() == YES) {\r
- DoQUOTE(AskCmdCtrlSkt(), "GUARDIAN");\r
+ DoQUOTE(AskCmdCtrlSkt(), "GUARDIAN", &CancelFlg);\r
SetOSS(NO);\r
} else {\r
- DoQUOTE(AskCmdCtrlSkt(), "OSS");\r
+ DoQUOTE(AskCmdCtrlSkt(), "OSS", &CancelFlg);\r
SetOSS(YES);\r
}\r
/* Current Dir 再取得 */\r