Change to encode reply messages with Kanji code of filenames.

[ffftp/ffftp.git] / common.h

diff --git a/common.h b/common.h
index beea818..c078703 100644 (file)
--- a/common.h
+++ b/common.h
@@ -75,7 +75,9 @@
 #define PROGRAM_VERSION_NUM            1990            /* バージョン */\r
 \r
 \r
-#define MYWEB_URL      "http://www2.biglobe.ne.jp/~sota/ffftp-qa.html"\r
+// SourceForge.JPによるフォーク\r
+//#define MYWEB_URL    "http://www2.biglobe.ne.jp/~sota/ffftp-qa.html"\r
+#define MYWEB_URL      "http://sourceforge.jp/projects/ffftp/"\r
 \r
 \r
 \r
@@ -687,9 +689,12 @@ LIST_UNIX_70
 #define KANJI_SMB_HEX  3               /* Samba-HEX */\r
 #define KANJI_SMB_CAP  4               /* Samba-CAP */\r
 #define KANJI_UTF8N            5               /* UTF-8 */\r
+// UTF-8対応\r
+#define KANJI_UTF8BOM          6               /* UTF-8 BOM */\r
 \r
 #define KANJI_NOCNV            -1              /* 漢字コード変換なし */\r
 \r
+// UTF-8対応\r
 #define KANJI_AUTO             -1\r
 \r
 /*===== サウンド =====*/\r
@@ -1233,8 +1238,8 @@ int BackgrndMessageProc(void);
 void ResetAutoExitFlg(void);\r
 int AskAutoExit(void);\r
 // 暗号化通信対応\r
-BOOL __stdcall SSLTimeoutCallback();\r
-BOOL __stdcall SSLConfirmCallback(BOOL bVerified, LPCSTR Certificate, LPCSTR CommonName);\r
+BOOL __stdcall SSLTimeoutCallback(BOOL* pbAborted);\r
+BOOL __stdcall SSLConfirmCallback(BOOL* pbAborted, BOOL bVerified, LPCSTR Certificate, LPCSTR CommonName);\r
 \r
 /*===== filelist.c =====*/\r
 \r
@@ -1395,7 +1400,7 @@ void SaveCurrentSetToHost(void);
 int ReConnectCmdSkt(void);\r
 // int ReConnectTrnSkt(void);\r
 // 同時接続対応\r
-int ReConnectTrnSkt(SOCKET *Skt);\r
+int ReConnectTrnSkt(SOCKET *Skt, int *CancelCheckWork);\r
 SOCKET AskCmdCtrlSkt(void);\r
 SOCKET AskTrnCtrlSkt(void);\r
 void SktShareProh(void);\r
@@ -1406,7 +1411,9 @@ int AskConnecting(void);
 SOCKET connectsock(char *host, int port, char *PreMsg, int *CancelCheckWork);\r
 SOCKET GetFTPListenSocket(SOCKET ctrl_skt, int *CancelCheckWork);\r
 int AskTryingConnect(void);\r
-int SocksGet2ndBindReply(SOCKET Socket, SOCKET *Data);\r
+// 同時接続対応\r
+//int SocksGet2ndBindReply(SOCKET Socket, SOCKET *Data);\r
+int SocksGet2ndBindReply(SOCKET Socket, SOCKET *Data, int *CancelCheckWork);\r
 // 暗号化通信対応\r
 int AskCryptMode(void);\r
 int AskUseNoEncryption(void);\r
@@ -1462,7 +1469,9 @@ void SomeCmdProc(void);
 void CalcFileSizeProc(void);\r
 void DispCWDerror(HWND hWnd);\r
 void CopyURLtoClipBoard(void);\r
-int ProcForNonFullpath(char *Path, char *CurDir, HWND hWnd, int Type);\r
+// 同時接続対応\r
+//int ProcForNonFullpath(char *Path, char *CurDir, HWND hWnd, int Type);\r
+int ProcForNonFullpath(SOCKET cSkt, char *Path, char *CurDir, HWND hWnd, int *CancelCheckWork);\r
 void ReformToVMSstyleDirName(char *Path);\r
 void ReformToVMSstylePathName(char *Path);\r
 #if defined(HAVE_OPENVMS)\r
@@ -1493,9 +1502,10 @@ int DoRENAME(char *Src, char *Dst);
 int DoCHMOD(char *Path, char *Mode);\r
 // 同時接続対応\r
 //int DoSIZE(char *Path, LONGLONG *Size);\r
+int DoSIZE(SOCKET cSkt, char *Path, LONGLONG *Size, int *CancelCheckWork);\r
+// 同時接続対応\r
 //int DoMDTM(char *Path, FILETIME *Time);\r
-int DoSIZE(SOCKET cSkt, char *Path, LONGLONG *Size);\r
-int DoMDTM(SOCKET cSkt, char *Path, FILETIME *Time);\r
+int DoMDTM(SOCKET cSkt, char *Path, FILETIME *Time, int *CancelCheckWork);\r
 int DoQUOTE(char *CmdStr);\r
 SOCKET DoClose(SOCKET Sock);\r
 int DoQUIT(SOCKET ctrl_skt);\r
@@ -1503,7 +1513,7 @@ int DoDirListCmdSkt(char *AddOpt, char *Path, int Num, int *CancelCheckWork);
 int CommandProcCmd(char *Reply, char *fmt, ...);\r
 // 同時接続対応\r
 //int CommandProcTrn(char *Reply, char *fmt, ...);\r
-int CommandProcTrn(SOCKET cSkt, char *Reply, char *fmt, ...);\r
+int CommandProcTrn(SOCKET cSkt, char *Reply, int* CancelCheckWork, char *fmt, ...);\r
 int command(SOCKET cSkt, char *Reply, int *CancelCheckWork, char *fmt, ...);\r
 int SendData(SOCKET Skt, char *Data, int Size, int Mode, int *CancelCheckWork);\r
 int ReadReplyMessage(SOCKET cSkt, char *Buf, int Max, int *CancelCheckWork, char *Tmp);\r
@@ -1714,6 +1724,8 @@ int do_listen(SOCKET s,   int backlog);
 SOCKET do_accept(SOCKET s, struct sockaddr *addr, int *addrlen);\r
 int do_recv(SOCKET s, char *buf, int len, int flags, int *TimeOut, int *CancelCheckWork);\r
 int do_send(SOCKET s, const char *buf, int len, int flags, int *TimeOutErr, int *CancelCheckWork);\r
+// 同時接続対応\r
+void RemoveReceivedData(SOCKET s);\r
 int CheckClosedAndReconnect(void);\r
 void CheckAllEventClosed(void);\r
 \r