OSDN Git Service

Replace UTF-8N to UTF-8 (UTF-8N is obscure and identical to UTF-8 in this case).
[ffftp/ffftp.git] / common.h
index c661dad..9acd714 100644 (file)
--- a/common.h
+++ b/common.h
 \r
 /*===== \83o\81[\83W\83\87\83\93 ======*/\r
 \r
-#define VER_STR                                        "1.97b"\r
-#define VER_NUM                                        1921            /* \90Ý\92è\83o\81[\83W\83\87\83\93 */\r
-#define PROGRAM_VERSION_NUM            1972            /* \83o\81[\83W\83\87\83\93 */\r
+// SourceForge.JP\82É\82æ\82é\83t\83H\81[\83N\r
+//#define VER_STR                                      "1.97b"\r
+//#define VER_NUM                                      1921            /* \90Ý\92è\83o\81[\83W\83\87\83\93 */\r
+//#define PROGRAM_VERSION_NUM          1972            /* \83o\81[\83W\83\87\83\93 */\r
+#define VER_STR                                        "1.98"\r
+#define VER_NUM                                        1980            /* \90Ý\92è\83o\81[\83W\83\87\83\93 */\r
+#define PROGRAM_VERSION_NUM            1980            /* \83o\81[\83W\83\87\83\93 */\r
 \r
 \r
 #define MYWEB_URL      "http://www2.biglobe.ne.jp/~sota/ffftp-qa.html"\r
@@ -674,7 +678,7 @@ LIST_UNIX_70
 #define KANJI_EUC              2               /* EUC */\r
 #define KANJI_SMB_HEX  3               /* Samba-HEX */\r
 #define KANJI_SMB_CAP  4               /* Samba-CAP */\r
-#define KANJI_UTF8N            5               /* UTF-8N */\r
+#define KANJI_UTF8N            5               /* UTF-8 */\r
 \r
 #define KANJI_NOCNV            -1              /* \8a¿\8e\9a\83R\81[\83h\95Ï\8a·\82È\82µ */\r
 \r
@@ -853,6 +857,12 @@ LIST_UNIX_70
 #define DEFAULT_PASSWORD       "DefaultPassword"\r
 #define MAX_PASSWORD_LEN       128\r
 \r
+// \88Ã\8d\86\89»\92Ê\90M\91Î\89\9e\r
+#define CRYPT_NONE                     0\r
+#define CRYPT_FTPES                    1\r
+#define CRYPT_FTPIS                    2\r
+#define CRYPT_SFTP                     3\r
+\r
 \r
 /*=================================================\r
 *              \83X\83g\83\89\83N\83`\83\83\r
@@ -896,6 +906,11 @@ typedef struct {
        int DialupAlways;                                       /* \8fí\82É\82±\82Ì\83G\83\93\83g\83\8a\82Ö\90Ú\91±\82·\82é\82©\82Ç\82¤\82© (YES/NO) */\r
        int DialupNotify;                                       /* \8dÄ\90Ú\91±\82Ì\8dÛ\82É\8am\94F\82·\82é (YES/NO) */\r
        char DialEntry[RAS_NAME_LEN+1];         /* \83_\83C\83A\83\8b\83A\83b\83v\83G\83\93\83g\83\8a */\r
+       // \88Ã\8d\86\89»\92Ê\90M\91Î\89\9e\r
+       int CryptMode;                                          /* \88Ã\8d\86\89»\92Ê\90M\83\82\81[\83h (CRYPT_xxx) */\r
+       int UseFTPES;                                           /* FTPES\82Å\90Ú\91±\82·\82é (YES/NO) */\r
+       int UseFTPIS;                                           /* FTPIS\82Å\90Ú\91±\82·\82é (YES/NO) */\r
+       int UseSFTP;                                            /* SFTP\82Å\90Ú\91±\82·\82é (YES/NO) */\r
 } HOSTDATA;\r
 \r
 \r
@@ -942,6 +957,10 @@ typedef struct historydata {
        int DialupAlways;                                       /* \8fí\82É\82±\82Ì\83G\83\93\83g\83\8a\82Ö\90Ú\91±\82·\82é\82©\82Ç\82¤\82© (YES/NO) */\r
        int DialupNotify;                                       /* \8dÄ\90Ú\91±\82Ì\8dÛ\82É\8am\94F\82·\82é (YES/NO) */\r
        char DialEntry[RAS_NAME_LEN+1];         /* \83_\83C\83A\83\8b\83A\83b\83v\83G\83\93\83g\83\8a */\r
+       // \88Ã\8d\86\89»\92Ê\90M\91Î\89\9e\r
+       int UseFTPES;                                           /* FTPES\82Å\90Ú\91±\82·\82é (YES/NO) */\r
+       int UseFTPIS;                                           /* FTPIS\82Å\90Ú\91±\82·\82é (YES/NO) */\r
+       int UseSFTP;                                            /* SFTP\82Å\90Ú\91±\82·\82é (YES/NO) */\r
        struct historydata *Next;\r
 } HISTORYDATA;\r
 \r
@@ -962,11 +981,14 @@ typedef struct transpacket {
        FILETIME Time;                                  /* \83t\83@\83C\83\8b\82Ì\8e\9e\8aÔ(UTC) */\r
        int Attr;                                               /* \83t\83@\83C\83\8b\82Ì\91®\90« */\r
        int KanjiCode;                                  /* \8a¿\8e\9a\83R\81[\83h (KANJI_xxx) */\r
-       int KanjiCodeDesired;                   /* \95Ï\8a·\90æ\82Ì\8a¿\8e\9a\83R\81[\83h (KANJI_xxx) */\r
+       // UTF-8\91Î\89\9e\r
+       int KanjiCodeDesired;                   /* \83\8d\81[\83J\83\8b\82Ì\8a¿\8e\9a\83R\81[\83h (KANJI_xxx) */\r
        int KanaCnv;                                    /* \94¼\8ap\83J\83i\82ð\91S\8ap\82É\95Ï\8a·(YES/NO) */\r
        int Mode;                                               /* \93]\91\97\83\82\81[\83h (EXIST_xxx) */\r
        HWND hWndTrans;                                 /* \93]\91\97\92\86\83_\83C\83A\83\8d\83O\82Ì\83E\83C\83\93\83h\83E\83n\83\93\83h\83\8b */\r
        int Abort;                                              /* \93]\91\97\92\86\8e~\83t\83\89\83O (ABORT_xxx) */\r
+       // \88Ã\8d\86\89»\92Ê\90M\91Î\89\9e\r
+       int CryptMode;                                  /* \88Ã\8d\86\89»\92Ê\90M\83\82\81[\83h (CRYPT_xxx) */\r
        struct transpacket *Next;\r
 } TRANSPACKET;\r
 \r
@@ -1169,6 +1191,8 @@ int AskForceIni(void);
 int BackgrndMessageProc(void);\r
 void ResetAutoExitFlg(void);\r
 int AskAutoExit(void);\r
+// \88Ã\8d\86\89»\92Ê\90M\91Î\89\9e\r
+BOOL __stdcall SSLTimeoutCallback();\r
 \r
 /*===== filelist.c =====*/\r
 \r
@@ -1340,6 +1364,11 @@ SOCKET connectsock(char *host, int port, char *PreMsg, int *CancelCheckWork);
 SOCKET GetFTPListenSocket(SOCKET ctrl_skt, int *CancelCheckWork);\r
 int AskTryingConnect(void);\r
 int SocksGet2ndBindReply(SOCKET Socket, SOCKET *Data);\r
+// \88Ã\8d\86\89»\92Ê\90M\91Î\89\9e\r
+int AskCryptMode(void);\r
+int AskUseFTPES(void);\r
+int AskUseFTPIS(void);\r
+int AskUseSFTP(void);\r
 \r
 /*===== cache.c =====*/\r
 \r
@@ -1455,12 +1484,12 @@ int FlushRestData(CODECONVINFO *cInfo);
 int ConvEUCtoSJIS(CODECONVINFO *cInfo);\r
 int ConvJIStoSJIS(CODECONVINFO *cInfo);\r
 int ConvSMBtoSJIS(CODECONVINFO *cInfo);\r
-int ConvUTF8NtoSJIS(CODECONVINFO *cInfo); // UTF-8N\91Î\89\9e\r
+int ConvUTF8NtoSJIS(CODECONVINFO *cInfo); // UTF-8\91Î\89\9e\r
 int ConvSJIStoEUC(CODECONVINFO *cInfo);\r
 int ConvSJIStoJIS(CODECONVINFO *cInfo);\r
 int ConvSJIStoSMB_HEX(CODECONVINFO *cInfo);\r
 int ConvSJIStoSMB_CAP(CODECONVINFO *cInfo);\r
-int ConvSJIStoUTF8N(CODECONVINFO *cInfo); // UTF-8N\91Î\89\9e\r
+int ConvSJIStoUTF8N(CODECONVINFO *cInfo); // UTF-8\91Î\89\9e\r
 void ConvAutoToSJIS(char *Text, int Pref);\r
 int CheckKanjiCode(char *Text, int Size, int Pref);\r
 \r