Add extensions of files that will be transferred in ASCII mode.

diff --git a/FFFTP_Eng_Release/FFFTP.exe b/FFFTP_Eng_Release/FFFTP.exe
index 8425597..2b4a49c 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 2b12504..f32a49a 100644 (file)
Binary files a/Release/FFFTP.exe and b/Release/FFFTP.exe differ

diff --git a/Resource/FFFTP.rc b/Resource/FFFTP.rc
index 786339c..5958f25 100644 (file)
--- a/Resource/FFFTP.rc
+++ b/Resource/FFFTP.rc
@@ -237,7 +237,7 @@ FONT 9, "MS Shell Dlg", 0, 0, 0x0
 BEGIN\r
     DEFPUSHBUTTON   "OK",IDOK,133,294,50,14\r
     ICON            ffftp,-1,7,4,20,20\r
-    CTEXT           "FFFTP  Ver 1.98e",-1,113,11,90,8\r
+    CTEXT           "FFFTP  Ver 1.98f",-1,113,11,90,8\r
     CTEXT           "FFFTP\82Ífreeware\82Å\82·",-1,7,279,305,8\r
     CTEXT           "Copyright(C) 1997-2010 Sota & \82²\8b¦\97Í\82¢\82½\82¾\82¢\82½\95û\81X\nCopyright (C) 2011-2012 FFFTP Project (Hiromichi Matsushima, Suguru Kawamoto, IWAMOTO Kouichi, vitamin0x, \82¤\82È\81[, Asami, fortran90, tomo1192, Yuji Tanaka, Moriguchi Hirokazu)",-1,7,25,305,44,SS_NOPREFIX\r
     CTEXT           "",ABOUT_JRE,7,96,305,8\r
@@ -2116,8 +2116,8 @@ nodrop_csr              CURSOR                  "nodrop_c.cur"
 //\r
 \r
 VS_VERSION_INFO VERSIONINFO\r
- FILEVERSION 1,98,5,0\r
- PRODUCTVERSION 1,98,5,0\r
+ FILEVERSION 1,98,6,0\r
+ PRODUCTVERSION 1,98,6,0\r
  FILEFLAGSMASK 0x3fL\r
 #ifdef _DEBUG\r
  FILEFLAGS 0x1L\r
@@ -2133,14 +2133,14 @@ BEGIN
         BLOCK "041104b0"\r
         BEGIN\r
             VALUE "Comments", "\82±\82ê\82Í\83t\83\8a\81[\83\\83t\83g\83E\83G\83A\82Å\82·\81B"\r
-            VALUE "CompanyName", " "\r
+            VALUE "CompanyName", "Sota, FFFTP Project"\r
             VALUE "FileDescription", "FFFTP"\r
-            VALUE "FileVersion", "1, 98, 5, 0"\r
+            VALUE "FileVersion", "1, 98, 6, 0"\r
             VALUE "InternalName", "FFFTP"\r
             VALUE "LegalCopyright", "Copyright (C) 1997-2010 Sota & \82²\8b¦\97Í\82¢\82½\82¾\82¢\82½\95û\81X\nCopyright (C) 2011-2012 FFFTP Project (Hiromichi Matsushima, Suguru Kawamoto, IWAMOTO Kouichi, vitamin0x, \82¤\82È\81[, Asami, fortran90, tomo1192, Yuji Tanaka, Moriguchi Hirokazu)."\r
             VALUE "OriginalFilename", "FFFTP.exe"\r
             VALUE "ProductName", "FFFTP"\r
-            VALUE "ProductVersion", "1, 98, 5, 0"\r
+            VALUE "ProductVersion", "1, 98, 6, 0"\r
         END\r
     END\r
     BLOCK "VarFileInfo"\r

diff --git a/Resource_eng/FFFTP-eng.rc b/Resource_eng/FFFTP-eng.rc
index 9bf6d26..8462396 100644 (file)
--- a/Resource_eng/FFFTP-eng.rc
+++ b/Resource_eng/FFFTP-eng.rc
@@ -237,7 +237,7 @@ FONT 9, "MS Shell Dlg", 0, 0, 0x0
 BEGIN\r
     DEFPUSHBUTTON   "OK",IDOK,132,296,50,14\r
     ICON            ffftp,-1,7,4,20,20\r
-    CTEXT           "FFFTP  Ver 1.98e",-1,110,11,90,8\r
+    CTEXT           "FFFTP  Ver 1.98f",-1,110,11,90,8\r
     CTEXT           "FFFTP is freeware",-1,7,281,301,8\r
     CTEXT           "Copyright(C) 1997-2010 Sota && cooperators\nCopyright (C) 2011-2012 FFFTP Project (Hiromichi Matsushima, Suguru Kawamoto, IWAMOTO Kouichi, vitamin0x, unarist, Asami, fortran90, tomo1192, Yuji Tanaka, Moriguchi Hirokazu)",-1,7,25,301,44\r
     CTEXT           "",ABOUT_JRE,7,93,301,8\r
@@ -2142,8 +2142,8 @@ nodrop_csr              CURSOR                  "nodrop_c.cur"
 //\r
 \r
 VS_VERSION_INFO VERSIONINFO\r
- FILEVERSION 1,98,5,0\r
- PRODUCTVERSION 1,98,5,0\r
+ FILEVERSION 1,98,6,0\r
+ PRODUCTVERSION 1,98,6,0\r
  FILEFLAGSMASK 0x3fL\r
 #ifdef _DEBUG\r
  FILEFLAGS 0x1L\r
@@ -2159,14 +2159,14 @@ BEGIN
         BLOCK "041104b0"\r
         BEGIN\r
             VALUE "Comments", "This software is Free Software"\r
-            VALUE "CompanyName", " Sota"\r
+            VALUE "CompanyName", "Sota, FFFTP Project"\r
             VALUE "FileDescription", "FFFTP"\r
-            VALUE "FileVersion", "1, 98, 5, 0"\r
+            VALUE "FileVersion", "1, 98, 6, 0"\r
             VALUE "InternalName", "FFFTP"\r
             VALUE "LegalCopyright", "Copyright (C) 1997-2010 Sota & cooperators\nCopyright (C) 2011-2012 FFFTP Project (Hiromichi Matsushima, Suguru Kawamoto, IWAMOTO Kouichi, vitamin0x, unarist, Asami, fortran90, tomo1192, Yuji Tanaka, Moriguchi Hirokazu)."\r
             VALUE "OriginalFilename", "FFFTP.exe"\r
             VALUE "ProductName", "FFFTP"\r
-            VALUE "ProductVersion", "1, 98, 5, 0"\r
+            VALUE "ProductVersion", "1, 98, 6, 0"\r
         END\r
     END\r
     BLOCK "VarFileInfo"\r

diff --git a/common.h b/common.h
index f21c08c..4e28e27 100644 (file)
--- a/common.h
+++ b/common.h
@@ -70,9 +70,9 @@
 //#define VER_STR                                      "1.97b"\r
 //#define VER_NUM                                      1921            /* 設定バージョン */\r
 //#define PROGRAM_VERSION_NUM          1972            /* バージョン */\r
-#define VER_STR                                        "1.98e"\r
-#define VER_NUM                                        1985            /* 設定バージョン */\r
-#define PROGRAM_VERSION_NUM            1985            /* バージョン */\r
+#define VER_STR                                        "1.98f"\r
+#define VER_NUM                                        1986            /* 設定バージョン */\r
+#define PROGRAM_VERSION_NUM            1986            /* バージョン */\r
 \r
 \r
 // SourceForge.JPによるフォーク\r

diff --git a/main.c b/main.c
index ff76c17..848b4e3 100644 (file)
--- a/main.c
+++ b/main.c
@@ -178,7 +178,7 @@ int DebugConsole = NO;
 int SaveWinPos = NO;\r
 // アスキーモード判別の改良\r
 //char AsciiExt[ASCII_EXT_LEN+1] = { "*.txt\0*.html\0*.htm\0*.cgi\0*.pl\0" };\r
-char AsciiExt[ASCII_EXT_LEN+1] = { "*.txt\0*.html\0*.htm\0*.cgi\0*.pl\0*.js\0*.vbs\0*.css\0*.rss\0*.rdf\0*.xml\0*.xhtml\0*.xht\0*.shtml\0*.shtm\0*.sh\0*.py\0*.rb\0" };\r
+char AsciiExt[ASCII_EXT_LEN+1] = { "*.txt\0*.html\0*.htm\0*.cgi\0*.pl\0*.js\0*.vbs\0*.css\0*.rss\0*.rdf\0*.xml\0*.xhtml\0*.xht\0*.shtml\0*.shtm\0*.sh\0*.py\0*.rb\0*.properties\0*.sql\0*.asp\0*.aspx\0*.php\0*.htaccess\0" };\r
 int RecvMode = TRANS_DLG;\r
 int SendMode = TRANS_DLG;\r
 int MoveMode = MOVE_DLG;\r

diff --git a/registry.c b/registry.c
index cf989f9..31e8339 100644 (file)
--- a/registry.c
+++ b/registry.c
@@ -771,6 +771,27 @@ int LoadRegistry(void)
                                                Pos++;\r
                                }\r
                        }\r
+                       // アスキーモード判別の改良\r
+                       if(Version < 1986)\r
+                       {\r
+                               Pos = "*.js\0*.vbs\0*.css\0*.rss\0*.rdf\0*.xml\0*.xhtml\0*.xht\0*.shtml\0*.shtm\0*.sh\0*.py\0*.rb\0*.properties\0*.sql\0*.asp\0*.aspx\0*.php\0*.htaccess\0";\r
+                               while(*Pos != NUL)\r
+                               {\r
+                                       Pos2 = AsciiExt;\r
+                                       while(*Pos2 != NUL)\r
+                                       {\r
+                                               if(_stricmp(Pos2, Pos) == 0)\r
+                                                       break;\r
+                                               Pos2 = strchr(Pos2, NUL) + 1;\r
+                                       }\r
+                                       if(*Pos2 == NUL)\r
+                                       {\r
+                                               if((StrMultiLen(AsciiExt) + strlen(Pos) + 2) < ASCII_EXT_LEN)\r
+                                                       strncpy(AsciiExt + StrMultiLen(AsciiExt), Pos, strlen(Pos) + 2);\r
+                                       }\r
+                                       Pos = strchr(Pos, NUL) + 1;\r
+                               }\r
+                       }\r
 \r
                        ReadIntValueFromReg(hKey4, "LowUp", &FnameCnv);\r
                        ReadIntValueFromReg(hKey4, "Tout", &TimeOut);\r