static SOCKET CmdCtrlSocket = INVALID_SOCKET;\r
static SOCKET TrnCtrlSocket = INVALID_SOCKET;\r
static HOSTDATA CurHost;\r
-// UTF-8対応\r
-static int TmpNameKanjiCode;\r
\r
/* 接続中の接続先、SOCKSサーバのアドレス情報を保存しておく */\r
/* この情報はlistenソケットを取得する際に用いる */\r
InitPWDcommand();\r
CopyHostFromList(AskCurrentHost(), &CurHost);\r
// UTF-8対応\r
- TmpNameKanjiCode = CurHost.NameKanjiCode;\r
+ CurHost.CurNameKanjiCode = CurHost.NameKanjiCode;\r
\r
if(ConnectRas(CurHost.Dialup, CurHost.DialupAlways, CurHost.DialupNotify, CurHost.DialEntry) == FFFTP_SUCCESS)\r
{\r
TrnCtrlSocket = CmdCtrlSocket;\r
\r
// UTF-8対応\r
- if(TmpNameKanjiCode == KANJI_AUTO)\r
+ if(CurHost.CurNameKanjiCode == KANJI_AUTO)\r
{\r
if(DoDirListCmdSkt("", "", 999, &CancelFlg) == FTP_COMPLETE)\r
- {\r
- SetCache(999, "");\r
- TmpNameKanjiCode = AnalyzeNameKanjiCode(999);\r
- }\r
+ CurHost.CurNameKanjiCode = AnalyzeNameKanjiCode(999);\r
}\r
\r
if(CmdCtrlSocket != INVALID_SOCKET)\r
InitPWDcommand();\r
CopyDefaultHost(&CurHost);\r
// UTF-8対応\r
- TmpNameKanjiCode = CurHost.NameKanjiCode;\r
+ CurHost.CurNameKanjiCode = CurHost.NameKanjiCode;\r
if(SplitUNCpath(Tmp, CurHost.HostAdrs, CurHost.RemoteInitDir, File, CurHost.UserName, CurHost.PassWord, &CurHost.Port) == FFFTP_SUCCESS)\r
{\r
if(strlen(CurHost.UserName) == 0)\r
TrnCtrlSocket = CmdCtrlSocket;\r
\r
// UTF-8対応\r
- if(TmpNameKanjiCode == KANJI_AUTO)\r
+ if(CurHost.CurNameKanjiCode == KANJI_AUTO)\r
{\r
if(DoDirListCmdSkt("", "", 999, &CancelFlg) == FTP_COMPLETE)\r
- {\r
- SetCache(999, "");\r
- TmpNameKanjiCode = AnalyzeNameKanjiCode(999);\r
- }\r
+ CurHost.CurNameKanjiCode = AnalyzeNameKanjiCode(999);\r
}\r
\r
if(CmdCtrlSocket != INVALID_SOCKET)\r
CurHost.NameKanjiCode = Fkanji;\r
CurHost.KanaCnv = YES; /* とりあえず */\r
// UTF-8対応\r
- TmpNameKanjiCode = CurHost.NameKanjiCode;\r
+ CurHost.CurNameKanjiCode = CurHost.NameKanjiCode;\r
\r
SetHostKanaCnvImm(CurHost.KanaCnv);\r
SetHostKanjiCodeImm(CurHost.KanjiCode);\r
TrnCtrlSocket = CmdCtrlSocket;\r
\r
// UTF-8対応\r
- if(TmpNameKanjiCode == KANJI_AUTO)\r
+ if(CurHost.CurNameKanjiCode == KANJI_AUTO)\r
{\r
if(DoDirListCmdSkt("", "", 999, &CancelFlg) == FTP_COMPLETE)\r
- {\r
- SetCache(999, "");\r
- TmpNameKanjiCode = AnalyzeNameKanjiCode(999);\r
- }\r
+ CurHost.CurNameKanjiCode = AnalyzeNameKanjiCode(999);\r
}\r
\r
if(CmdCtrlSocket != INVALID_SOCKET)\r
InitPWDcommand();\r
CopyHistoryToHost(&Hist, &CurHost);\r
// UTF-8対応\r
- TmpNameKanjiCode = CurHost.NameKanjiCode;\r
+ CurHost.CurNameKanjiCode = CurHost.NameKanjiCode;\r
\r
if(ConnectRas(CurHost.Dialup, CurHost.DialupAlways, CurHost.DialupNotify, CurHost.DialEntry) == FFFTP_SUCCESS)\r
{\r
TrnCtrlSocket = CmdCtrlSocket;\r
\r
// UTF-8対応\r
- if(TmpNameKanjiCode == KANJI_AUTO)\r
+ if(CurHost.CurNameKanjiCode == KANJI_AUTO)\r
{\r
if(DoDirListCmdSkt("", "", 999, &CancelFlg) == FTP_COMPLETE)\r
- {\r
- SetCache(999, "");\r
- TmpNameKanjiCode = AnalyzeNameKanjiCode(999);\r
- }\r
+ CurHost.CurNameKanjiCode = AnalyzeNameKanjiCode(999);\r
}\r
\r
if(CmdCtrlSocket != INVALID_SOCKET)\r
// CopyHostFromListInConnect(AskCurrentHost(), &CurHost);\r
//\r
// return(CurHost.NameKanjiCode);\r
- return(TmpNameKanjiCode);\r
+ return(CurHost.CurNameKanjiCode);\r
}\r
\r
\r
HostData.UseFTPIS = NO;\r
if(HostData.CryptMode != CRYPT_SFTP)\r
HostData.UseSFTP = NO;\r
+ // UTF-8対応\r
+ HostData.CurNameKanjiCode = HostData.NameKanjiCode;\r
// 暗号化通信対応\r
// 同時接続対応\r
// if((*Skt = DoConnect(CurHost.HostAdrs, CurHost.UserName, CurHost.PassWord, CurHost.Account, CurHost.Port, CurHost.FireWall, NO, CurHost.Security)) != INVALID_SOCKET)\r
HostData->Feature |= FEATURE_EPRT | FEATURE_EPSV;\r
}\r
// UTF-8対応\r
- if(TmpNameKanjiCode == KANJI_AUTO && (HostData->Feature & FEATURE_UTF8))\r
+ if(HostData->CurNameKanjiCode == KANJI_AUTO && (HostData->Feature & FEATURE_UTF8))\r
{\r
if((Sts = command(ContSock, Reply, CancelCheckWork, "OPTS UTF8 ON")) == 200)\r
- TmpNameKanjiCode = KANJI_UTF8N;\r
+ HostData->CurNameKanjiCode = KANJI_UTF8N;\r
}\r
}\r
}\r