#include <string.h>\r
#include <mbstring.h>\r
#include <time.h>\r
-#include <winsock.h>\r
+// IPv6対応\r
+//#include <winsock.h>\r
+#include <winsock2.h>\r
#include <windowsx.h>\r
#include <commctrl.h>\r
\r
&sTime.wHour, &sTime.wMinute, &sTime.wSecond) == 6)\r
{\r
SystemTimeToFileTime(&sTime, Time);\r
- SpecificLocalFileTime2FileTime(Time, AskHostTimeZone());\r
+ // 時刻はGMT\r
+// SpecificLocalFileTime2FileTime(Time, AskHostTimeZone());\r
\r
}\r
}\r
}\r
\r
\r
+// ホスト側の日時設定\r
+int DoMFMT(SOCKET cSkt, char *Path, FILETIME *Time, int *CancelCheckWork)\r
+{\r
+ int Sts;\r
+ char Tmp[1024];\r
+ SYSTEMTIME sTime;\r
+\r
+ FileTimeToSystemTime(Time, &sTime);\r
+\r
+ Sts = CommandProcTrn(cSkt, Tmp, CancelCheckWork, "MFMT %04d%02d%02d%02d%02d%02d %s", sTime.wYear, sTime.wMonth, sTime.wDay, sTime.wHour, sTime.wMinute, sTime.wSecond, Path);\r
+ return(Sts/100);\r
+}\r
+\r
+\r
/*----- リモート側のコマンドを実行 --------------------------------------------\r
*\r
* Parameter\r
* int 応答コードの１桁目\r
*----------------------------------------------------------------------------*/\r
\r
-int DoQUOTE(char *CmdStr)\r
+// 同時接続対応\r
+//int DoQUOTE(char *CmdStr)\r
+int DoQUOTE(SOCKET cSkt, char *CmdStr, int *CancelCheckWork)\r
{\r
int Sts;\r
\r
- Sts = CommandProcCmd(NULL, "%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
* int 応答コードの１桁目\r
*----------------------------------------------------------------------------*/\r
\r
-int DoQUIT(SOCKET ctrl_skt)\r
+// 同時接続対応\r
+//int DoQUIT(SOCKET ctrl_skt)\r
+int DoQUIT(SOCKET ctrl_skt, int *CancelCheckWork)\r
{\r
int Ret;\r
\r
if(SendQuit == YES)\r
// 同時接続対応\r
// Ret = command(ctrl_skt, NULL, &CheckCancelFlg, "QUIT") / 100;\r
- Ret = command(ctrl_skt, NULL, &CancelFlg, "QUIT") / 100;\r
+ Ret = command(ctrl_skt, NULL, CancelCheckWork, "QUIT") / 100;\r
\r
return(Ret);\r
}\r
MainTransPkt.hWndTrans = hWnd;\r
MainTransPkt.Next = NULL;\r
\r
- Sts = DoDownLoad(cSkt, &MainTransPkt, YES, CancelCheckWork);\r
+ Sts = DoDownload(cSkt, &MainTransPkt, YES, CancelCheckWork);\r
\r
//#pragma aaa\r
//DoPrintf("===== DoDirList Done.");\r
}\r
\r
\r
+#if defined(HAVE_TANDEM)\r
+/*----- OSS/Guardian ファイルシステムを切り替えるコマンドを送る ---------------\r
+*\r
+* Parameter\r
+* なし\r
+*\r
+* Return Value\r
+* なし\r
+*----------------------------------------------------------------------------*/\r
+\r
+void SwitchOSSProc(void)\r
+{\r
+ char Buf[MAX_PATH+1];\r
+\r
+ /* DoPWD でノード名の \ を保存するために OSSフラグも変更する */\r
+ if(AskOSS() == YES) {\r
+ DoQUOTE(AskCmdCtrlSkt(), "GUARDIAN", &CancelFlg);\r
+ SetOSS(NO);\r
+ } else {\r
+ DoQUOTE(AskCmdCtrlSkt(), "OSS", &CancelFlg);\r
+ SetOSS(YES);\r
+ }\r
+ /* Current Dir 再取得 */\r
+ if (DoPWD(Buf) == FTP_COMPLETE)\r
+ SetRemoteDirHist(Buf);\r
+ /* ファイルリスト再読み込み */\r
+ PostMessage(GetMainHwnd(), WM_COMMAND, MAKEWPARAM(REFRESH_REMOTE, 0), 0);\r
+\r
+ return;\r
+}\r
+#endif\r
+\r
+\r
/*----- リモート側へコマンドを送りリプライを待つ（転送ソケット）---------------\r
*\r
* Parameter\r
+* SOCKET cSkt : ソケット\r
* char *Reply : リプライのコピー先 (NULL=コピーしない)\r
+* int *CancelCheckWork :\r
* char *fmt : フォーマット文字列\r
* ... : パラメータ\r
*\r
//#pragma aaa\r
//static int cntcnt = 0;\r
\r
+// SFTP対応\r
+int ConvertFTPCommandToPuTTYSFTP(SOCKET cSkt, char *Reply, int *CancelCheckWork, char *Cmd)\r
+{\r
+ // TODO:\r
+ // 未実装\r
+ int Sts;\r
+ char NewCmd[FMAX_PATH*2];\r
+ static char RenameFrom[FMAX_PATH+1];\r
+ Sts = 429;\r
+ Reply[0] = '\0';\r
+ if(strcmp(Cmd, "QUIT") == 0)\r
+ {\r
+ sprintf(NewCmd, "ls\r\n");\r
+ SFTP_send(cSkt, NewCmd, strlen(NewCmd), 0);\r
+ }\r
+ if(strcmp(Cmd, "LIST") == 0)\r
+ {\r
+ sprintf(NewCmd, "ls\r\n");\r
+ SFTP_send(cSkt, NewCmd, strlen(NewCmd), 0);\r
+ }\r
+ else if(strncmp(Cmd, "REST ", 5) == 0)\r
+ {\r
+ SFTP_SetFilePosition(cSkt, (LONGLONG)_strtoi64(&Cmd[5], NULL, 10));\r
+ }\r
+ else if(strncmp(Cmd, "RETR ", 5) == 0)\r
+ {\r
+ sprintf(NewCmd, "get \"%s\"\r\n", &Cmd[5]);\r
+ SFTP_send(cSkt, NewCmd, strlen(NewCmd), 0);\r
+ }\r
+ else if(strncmp(Cmd, "STOR ", 5) == 0)\r
+ {\r
+ sprintf(NewCmd, "put \"%s\"\r\n", &Cmd[5]);\r
+ SFTP_send(cSkt, NewCmd, strlen(NewCmd), 0);\r
+ }\r
+ else if(strncmp(Cmd, "APPE ", 5) == 0)\r
+ {\r
+ sprintf(NewCmd, "reput \"%s\"\r\n", &Cmd[5]);\r
+ SFTP_send(cSkt, NewCmd, strlen(NewCmd), 0);\r
+ }\r
+ else if(strncmp(Cmd, "DELE ", 5) == 0)\r
+ {\r
+ sprintf(NewCmd, "rm \"%s\"\r\n", &Cmd[5]);\r
+ SFTP_send(cSkt, NewCmd, strlen(NewCmd), 0);\r
+ }\r
+ else if(strncmp(Cmd, "CWD ", 4) == 0)\r
+ {\r
+ sprintf(NewCmd, "cd \"%s\"\r\n", &Cmd[4]);\r
+ SFTP_send(cSkt, NewCmd, strlen(NewCmd), 0);\r
+ }\r
+ else if(strcmp(Cmd, "PWD") == 0)\r
+ {\r
+ sprintf(NewCmd, "pwd\r\n");\r
+ SFTP_send(cSkt, NewCmd, strlen(NewCmd), 0);\r
+ }\r
+ else if(strcmp(Cmd, "XPWD") == 0)\r
+ {\r
+ sprintf(NewCmd, "pwd\r\n");\r
+ SFTP_send(cSkt, NewCmd, strlen(NewCmd), 0);\r
+ }\r
+ else if(strncmp(Cmd, "MKD ", 4) == 0)\r
+ {\r
+ sprintf(NewCmd, "mkdir \"%s\"\r\n", &Cmd[4]);\r
+ SFTP_send(cSkt, NewCmd, strlen(NewCmd), 0);\r
+ }\r
+ else if(strncmp(Cmd, "RMD ", 4) == 0)\r
+ {\r
+ sprintf(NewCmd, "rmdir \"%s\"\r\n", &Cmd[4]);\r
+ SFTP_send(cSkt, NewCmd, strlen(NewCmd), 0);\r
+ }\r
+ else if(strncmp(Cmd, "RNFR ", 5) == 0)\r
+ {\r
+ strcpy(RenameFrom, &Cmd[5]);\r
+ }\r
+ else if(strncmp(Cmd, "RNTO ", 5) == 0)\r
+ {\r
+ sprintf(NewCmd, "mv \"%s\" \"%s\"\r\n", RenameFrom, &Cmd[5]);\r
+ SFTP_send(cSkt, NewCmd, strlen(NewCmd), 0);\r
+ }\r
+ else if(strncmp(Cmd, "SITE CHMOD ", 11) == 0)\r
+ {\r
+ Cmd[14] = '\0';\r
+ sprintf(NewCmd, "chmod %s \"%s\"\r\n", &Cmd[11], &Cmd[15]);\r
+ SFTP_send(cSkt, NewCmd, strlen(NewCmd), 0);\r
+ }\r
+ return Sts;\r
+}\r
+\r
int command(SOCKET cSkt, char *Reply, int *CancelCheckWork, char *fmt, ...)\r
{\r
va_list Args;\r
wvsprintf(Cmd, fmt, Args);\r
va_end(Args);\r
\r
+ // SFTP対応\r
+ if(IsSFTPAttached(cSkt))\r
+ return ConvertFTPCommandToPuTTYSFTP(cSkt, Reply, CancelCheckWork, Cmd);\r
+\r
if(strncmp(Cmd, "PASS ", 5) == 0)\r
SetTaskMsg(">PASS [xxxxxx]");\r
else if((strncmp(Cmd, "USER ", 5) == 0) ||\r
OSDN Git Service
