Fix bugs of uploading files with unique names.

[ffftp/ffftp.git] / common.h

diff --git a/common.h b/common.h
index abba3f5..9d93f41 100644 (file)
--- a/common.h
+++ b/common.h
@@ -30,12 +30,12 @@
 #define __COMMON_H__\r
 \r
 #include "config.h"\r
-#ifndef ENGLISH\r
+#ifndef FFFTP_ENGLISH\r
 #include "mesg-jpn.h"\r
 #else\r
 #include "mesg-eng.h"\r
 #endif\r
-#include "msgutil.h"\r
+\r
 \r
 #define NUL                            '\0'\r
 \r
@@ -1422,11 +1422,11 @@ void DispDownloadSize(LONGLONG Size);
 int MakeTaskWindow(HWND hWnd, HINSTANCE hInst);\r
 void DeleteTaskWindow(void);\r
 HWND GetTaskWnd(void);\r
-void SetTaskMsg(const char *szFormat, ...);\r
+void SetTaskMsg(char *szFormat, ...);\r
 int SaveTaskMsg(char *Fname);\r
 void DispTaskMsg(void);\r
-void DoPrintf(const char *szFormat, ...);\r
-void DoPrintf2(const char *szFormat, ...);\r
+void DoPrintf(char *szFormat, ...);\r
+void DoPrintf2(char *szFormat, ...);\r
 \r
 /*===== hostman.c =====*/\r
 \r
@@ -1485,10 +1485,10 @@ int AskRealHostType(void);
 int SetOSS(int wkOss);\r
 int AskOSS(void);\r
 #endif\r
-SOCKET connectsock(char *host, int port, const char *PreMsg, int *CancelCheckWork);\r
+SOCKET connectsock(char *host, int port, char *PreMsg, int *CancelCheckWork);\r
 // IPv6対応\r
-SOCKET connectsockIPv4(const char *host, int port, const char *PreMsg, int *CancelCheckWork);\r
-SOCKET connectsockIPv6(const char *host, int port, const char *PreMsg, int *CancelCheckWork);\r
+SOCKET connectsockIPv4(char *host, int port, char *PreMsg, int *CancelCheckWork);\r
+SOCKET connectsockIPv6(char *host, int port, char *PreMsg, int *CancelCheckWork);\r
 SOCKET GetFTPListenSocket(SOCKET ctrl_skt, int *CancelCheckWork);\r
 // IPv6対応\r
 SOCKET GetFTPListenSocketIPv4(SOCKET ctrl_skt, int *CancelCheckWork);\r
@@ -1599,7 +1599,9 @@ int DoSIZE(SOCKET cSkt, char *Path, LONGLONG *Size, int *CancelCheckWork);
 // 同時接続対応\r
 //int DoMDTM(char *Path, FILETIME *Time);\r
 int DoMDTM(SOCKET cSkt, char *Path, FILETIME *Time, int *CancelCheckWork);\r
-int DoQUOTE(char *CmdStr);\r
+// 同時接続対応\r
+//int DoQUOTE(char *CmdStr);\r
+int DoQUOTE(SOCKET cSkt, char *CmdStr, int *CancelCheckWork);\r
 SOCKET DoClose(SOCKET Sock);\r
 int DoQUIT(SOCKET ctrl_skt);\r
 int DoDirListCmdSkt(char *AddOpt, char *Path, int Num, int *CancelCheckWork);\r
@@ -1722,7 +1724,7 @@ int ConnectRas(int Dialup, int UseThis, int Notify, char *Name);
 \r
 /*===== misc.c =====*/\r
 \r
-int InputDialogBox(int Res, HWND hWnd, const char *Title, char *Buf, int Max, int *Flg, int Help);\r
+int InputDialogBox(int Res, HWND hWnd, char *Title, char *Buf, int Max, int *Flg, int Help);\r
 // 64ビット対応\r
 //BOOL CALLBACK ExeEscDialogProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam);\r
 INT_PTR CALLBACK ExeEscDialogProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam);\r
@@ -1760,7 +1762,7 @@ void SpecificLocalFileTime2FileTime(FILETIME *Time, int TimeZone);
 int AttrString2Value(char *Str);\r
 void AttrValue2String(int Attr, char *Buf);\r
 void FormatIniString(char *Str);\r
-int SelectFile(HWND hWnd, char *Fname, const char *Title, const char *Filters, const char *Ext, int Flags, int Save);\r
+int SelectFile(HWND hWnd, char *Fname, char *Title, char *Filters, char *Ext, int Flags, int Save);\r
 int SelectDir(HWND hWnd, char *Buf, int MaxLen);\r
 void SetRadioButtonByValue(HWND hDlg, int Value, const RADIOBUTTON *Buttons, int Num);\r
 int AskRadioButtonValue(HWND hDlg, const RADIOBUTTON *Buttons, int Num);\r
@@ -1837,7 +1839,8 @@ int do_send(SOCKET s, const char *buf, int len, int flags, int *TimeOutErr, int
 // 同時接続対応\r
 void RemoveReceivedData(SOCKET s);\r
 int CheckClosedAndReconnect(void);\r
-void CheckAllEventClosed(void);\r
+// 同時接続対応\r
+int CheckClosedAndReconnectTrnSkt(SOCKET *Skt, int *CancelCheckWork);\r
 \r
 /*===== updatebell.c =====*/\r
 \r