Fix bugs of routines for IPv6.

Modify documents.

diff --git a/FFFTP_Eng_Release/FFFTP.exe b/FFFTP_Eng_Release/FFFTP.exe
index b482dfb..1367f2a 100644 (file)
Binary files a/FFFTP_Eng_Release/FFFTP.exe and b/FFFTP_Eng_Release/FFFTP.exe differ

diff --git a/Release/FFFTP.exe b/Release/FFFTP.exe
index 85befd5..4d88b3e 100644 (file)
Binary files a/Release/FFFTP.exe and b/Release/FFFTP.exe differ

diff --git a/connect.c b/connect.c
index 38284b1..989c026 100644 (file)
--- a/connect.c
+++ b/connect.c
@@ -2492,14 +2492,14 @@ SOCKET GetFTPListenSocketIPv6(SOCKET ctrl_skt, int *CancelCheckWork)
 \r
        if(listen_skt != INVALID_SOCKET)\r
        {\r
-#define  US(w)  (((int)w)&0xffff)\r
+#define  UC(b)  (((int)b)&0xff)\r
                // 同時接続対応\r
 //             if((command(ctrl_skt,NULL, &CancelFlg, "PORT %d,%d,%d,%d,%d,%d",\r
 //                             UC(a[0]), UC(a[1]), UC(a[2]), UC(a[3]),\r
 //                             UC(p[0]), UC(p[1])) / 100) != FTP_COMPLETE)\r
                if((command(ctrl_skt,NULL, CancelCheckWork, "EPRT |2|%s|%d|",\r
                                AddressToStringIPv6(Adrs, a),\r
-                               US(p[0])) / 100) != FTP_COMPLETE)\r
+                               (UC(p[0]) << 8) | UC(p[1])) / 100) != FTP_COMPLETE)\r
                {\r
                        SetTaskMsg(MSGJPN031);\r
                        do_closesocket(listen_skt);\r

diff --git a/doc/eng/FFFTP.txt b/doc/eng/FFFTP.txt
index 3a7925f..b3ae7da 100644 (file)
--- a/doc/eng/FFFTP.txt
+++ b/doc/eng/FFFTP.txt
@@ -47,6 +47,8 @@ Changes in Ver.1.99
 -- Internet Protocol Version 6 became available.\r
    IPv6 will be used when name resolution for IPv4 is unavailable.\r
 \r
+-- Changed to detect encoding of strings in INI file automatically.\r
+\r
 \r
 Outline\r
 -------\r

diff --git a/doc/eng/history.txt b/doc/eng/history.txt
index 762b746..b683a74 100644 (file)
--- a/doc/eng/history.txt
+++ b/doc/eng/history.txt
@@ -19,6 +19,8 @@ Changes in Ver.1.99
 -- Internet Protocol Version 6 became available.\r
    IPv6 will be used when name resolution for IPv4 is unavailable.\r
 \r
+-- Changed to detect encoding of strings in INI file automatically.\r
+\r
 Changes in Ver.1.98c\r
 --------------------\r
 \r

diff --git a/doc/jpn/FFFTP.txt b/doc/jpn/FFFTP.txt
index 068e714..29ed96f 100644 (file)
--- a/doc/jpn/FFFTP.txt
+++ b/doc/jpn/FFFTP.txt
@@ -49,6 +49,8 @@ Ver 1.99
 \81@\82æ\82¤\82É\82È\82è\82Ü\82µ\82½\81B\8f]\97\88\82ÌIPv4\82Å\96¼\91O\89ð\8c\88\82ª\82Å\82«\82È\82¢\8fê\8d\87\82ÉIPv6\82Å\90Ú\91±\82ð\r
 \81@\8e\8e\82Ý\82é\82æ\82¤\82É\82µ\82Ü\82µ\82½\81B\r
 \r
+\81EINI\83t\83@\83C\83\8b\82Ì\95¶\8e\9a\97ñ\82Ì\95¶\8e\9a\83R\81[\83h\82ð\8e©\93®\94»\95Ê\82·\82é\82æ\82¤\82É\95Ï\8dX\82µ\82Ü\82µ\82½\81B\r
+\r
 \r
 Ver 1.96d\88È\91O\82Ö\96ß\82·\8fê\8d\87\r
 -----------------------\r

diff --git a/doc/jpn/history.txt b/doc/jpn/history.txt
index 4bff19c..cc99abd 100644 (file)
--- a/doc/jpn/history.txt
+++ b/doc/jpn/history.txt
@@ -21,6 +21,8 @@ FFFTP
 \81@\82æ\82¤\82É\82È\82è\82Ü\82µ\82½\81B\8f]\97\88\82ÌIPv4\82Å\96¼\91O\89ð\8c\88\82ª\82Å\82«\82È\82¢\8fê\8d\87\82ÉIPv6\82Å\90Ú\91±\82ð\r
 \81@\8e\8e\82Ý\82é\82æ\82¤\82É\82µ\82Ü\82µ\82½\81B\r
 \r
+\81EINI\83t\83@\83C\83\8b\82Ì\95¶\8e\9a\97ñ\82Ì\95¶\8e\9a\83R\81[\83h\82ð\8e©\93®\94»\95Ê\82·\82é\82æ\82¤\82É\95Ï\8dX\82µ\82Ü\82µ\82½\81B\r
+\r
 \81¡Ver 1.98c\r
 \r
 \81E\93ú\96{\8cê\83h\83\81\83C\83\93\96¼\82Ì\83z\83X\83g\82Ö\82Ì\90Ú\91±\8e\9e\82É\83A\83h\83\8c\83X\82ðPunycode\82Ö\95Ï\8a·\82µ\82Ä\82©\82ç\r