提交: 541deac70191d2398920f2ba87b1ed629d91b121 - ffftp (git)

FFFTPのソースコードです。

Commit MetaInfo

• 修訂: 541deac70191d2398920f2ba87b1ed629d91b121 (tree)
• 時間: 2012-04-25 20:33:57
• 作者: s_kawamoto <s_kawamoto@user...>
• Commiter: s_kawamoto

Log Message

Add extensions of files that will be transferred in ASCII mode.
Fix bugs of converting old type extensions lists.

Change Summary

• modified: FFFTP_Eng_Release/FFFTP.exe
• modified: Release/FFFTP.exe
• modified: main.c
• modified: registry.c

差異

Binary files a/FFFTP_Eng_Release/FFFTP.exe and b/FFFTP_Eng_Release/FFFTP.exe differ

Binary files a/Release/FFFTP.exe and b/Release/FFFTP.exe differ

--- a/main.c
+++ b/main.c
@@ -176,7 +176,9 @@ int TransMode = TYPE_X;
 int ConnectOnStart = YES;
 int DebugConsole = NO;
 int SaveWinPos = NO;
-char AsciiExt[ASCII_EXT_LEN+1] = { "*.txt\0*.html\0*.htm\0*.cgi\0*.pl\0" };
+// アスキーモード判別の改良
+//char AsciiExt[ASCII_EXT_LEN+1] = { "*.txt\0*.html\0*.htm\0*.cgi\0*.pl\0" };
+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" };
 int RecvMode = TRANS_DLG;
 int SendMode = TRANS_DLG;
 int MoveMode = MOVE_DLG;

--- a/registry.c
+++ b/registry.c
@@ -748,8 +748,12 @@ int LoadRegistry(void)
 			if(ReadMultiStringFromReg(hKey4, "AsciiFile", AsciiExt, ASCII_EXT_LEN+1) == FFFTP_FAIL)
 			{
 				/* 旧ASCIIモードの拡張子の設定を新しいものに変換 */
-				ReadStringFromReg(hKey4, "Ascii", Str, ASCII_EXT_LEN+1);
-				memset(AsciiExt, NUL, ASCII_EXT_LEN+1);
+				// アスキーモード判別の改良
+//				ReadStringFromReg(hKey4, "Ascii", Str, ASCII_EXT_LEN+1);
+//				memset(AsciiExt, NUL, ASCII_EXT_LEN+1);
+				Str[0] = NUL;
+				if(ReadStringFromReg(hKey4, "Ascii", Str, ASCII_EXT_LEN+1) == FFFTP_SUCCESS)
+					memset(AsciiExt, NUL, ASCII_EXT_LEN+1);
 				Pos = Str;
 				while(*Pos != NUL)
 				{