Commit: f3bb77eff8ad09c3a64851ad1b2790823afe02f2 - ffftp (git)

FFFTPのソースコードです。

Commit MetaInfo

• Revision: f3bb77eff8ad09c3a64851ad1b2790823afe02f2 (tree)
• Zeit: 2013-10-20 01:21:40
• Autor: s_kawamoto <s_kawamoto@user...>
• Commiter: s_kawamoto

Log Message

Add support for UTF-8 HFS+ filenames (Windows Vista or later only).

Ändern Zusammenfassung

• modified: FFFTP_Eng_Release/FFFTP.exe
• modified: Release/FFFTP.exe
• modified: Resource/FFFTP.rc
• modified: Resource/resource.h
• modified: Resource_eng/FFFTP-eng.rc
• modified: Resource_eng/resource.h
• modified: codecnv.c
• modified: common.h
• modified: connect.c
• modified: filelist.c
• modified: hostman.c
• modified: main.c
• modified: mbswrapper.c
• modified: mbswrapper.h
• modified: remote.c

Diff

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/Resource/FFFTP.rc
+++ b/Resource/FFFTP.rc
@@ -750,15 +750,16 @@ BEGIN
     CONTROL         "UTF-8",HSET_UTF8N_CNV,"Button",BS_AUTORADIOBUTTON,12,69,41,10
     CONTROL         "UTF-8 BOM",HSET_UTF8BOM_CNV,"Button",BS_AUTORADIOBUTTON,12,81,81,10
     CONTROL         "”¼ŠpƒJƒi‚ð‘SŠp‚É•ÏŠ·",HSET_HANCNV,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,12,98,87,10
-    GROUPBOX        "ƒtƒ@ƒCƒ‹–¼‚ÌŠ¿ŽšƒR[ƒh(&N)",-1,110,7,90,115,WS_GROUP
+    GROUPBOX        "ƒtƒ@ƒCƒ‹–¼‚ÌŠ¿ŽšƒR[ƒh(&N)",-1,110,7,90,127,WS_GROUP
     CONTROL         "Ž©“®",HSET_FN_AUTO_CNV,"Button",BS_AUTORADIOBUTTON | WS_GROUP,114,21,65,10
-    CONTROL         "Shift_JIS",HSET_FN_SJIS_CNV,"Button",BS_AUTORADIOBUTTON,114,33,65,10
-    CONTROL         "JIS",HSET_FN_JIS_CNV,"Button",BS_AUTORADIOBUTTON,114,45,70,10
-    CONTROL         "EUC",HSET_FN_EUC_CNV,"Button",BS_AUTORADIOBUTTON,114,57,41,10
-    CONTROL         "Samba-HEX",HSET_FN_SMH_CNV,"Button",BS_AUTORADIOBUTTON,114,69,66,10
-    CONTROL         "Samba-CAP",HSET_FN_SMC_CNV,"Button",BS_AUTORADIOBUTTON,114,81,64,10
-    CONTROL         "UTF-8",HSET_FN_UTF8N_CNV,"Button",BS_AUTORADIOBUTTON,114,93,41,10
-    CONTROL         "”¼ŠpƒJƒi‚ð‘SŠp‚É•ÏŠ·",HSET_FN_HANCNV,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,114,107,81,10
+    CONTROL         "Shift_JIS",HSET_FN_SJIS_CNV,"Button",BS_AUTORADIOBUTTON,114,33,81,10
+    CONTROL         "JIS",HSET_FN_JIS_CNV,"Button",BS_AUTORADIOBUTTON,114,45,81,10
+    CONTROL         "EUC",HSET_FN_EUC_CNV,"Button",BS_AUTORADIOBUTTON,114,57,81,10
+    CONTROL         "Samba-HEX",HSET_FN_SMH_CNV,"Button",BS_AUTORADIOBUTTON,114,69,81,10
+    CONTROL         "Samba-CAP",HSET_FN_SMC_CNV,"Button",BS_AUTORADIOBUTTON,114,81,81,10
+    CONTROL         "UTF-8",HSET_FN_UTF8N_CNV,"Button",BS_AUTORADIOBUTTON,114,93,81,10
+    CONTROL         "UTF-8 HFS+",HSET_FN_UTF8HFSX_CNV,"Button",BS_AUTORADIOBUTTON,114,105,81,10
+    CONTROL         "”¼ŠpƒJƒi‚ð‘SŠp‚É•ÏŠ·",HSET_FN_HANCNV,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,114,119,81,10
 END
 
 opt_trmode1_dlg DIALOG  0, 0, 211, 155

--- a/Resource/resource.h
+++ b/Resource/resource.h
@@ -460,6 +460,7 @@
 #define TRMODE4_UTF8N_CNV               1218
 #define TRMODE4_UTF8BOM_CNV             1219
 #define HSET_ERROR_RECONNECT            1220
+#define HSET_FN_UTF8HFSX_CNV            1221
 #define MENU_END                        40001
 #define MENU_EXIT                       40001
 #define MENU_CONNECT                    40003

--- a/Resource_eng/FFFTP-eng.rc
+++ b/Resource_eng/FFFTP-eng.rc
@@ -758,15 +758,16 @@ BEGIN
     CONTROL         "UTF-8",HSET_UTF8N_CNV,"Button",BS_AUTORADIOBUTTON,12,69,41,10
     CONTROL         "UTF-8 BOM",HSET_UTF8BOM_CNV,"Button",BS_AUTORADIOBUTTON,12,81,81,10
     CONTROL         "Hankaku to Zenkaku",HSET_HANCNV,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,12,98,90,10
-    GROUPBOX        "&Filename Kanji Code",-1,107,7,97,116,WS_GROUP
+    GROUPBOX        "&Filename Kanji Code",-1,107,7,97,127,WS_GROUP
     CONTROL         "Automatic",HSET_FN_AUTO_CNV,"Button",BS_AUTORADIOBUTTON | WS_GROUP,111,21,65,10
-    CONTROL         "Shift_JIS",HSET_FN_SJIS_CNV,"Button",BS_AUTORADIOBUTTON,111,33,65,10
-    CONTROL         "JIS",HSET_FN_JIS_CNV,"Button",BS_AUTORADIOBUTTON,111,45,70,10
-    CONTROL         "EUC",HSET_FN_EUC_CNV,"Button",BS_AUTORADIOBUTTON,111,57,41,10
-    CONTROL         "Samba-HEX",HSET_FN_SMH_CNV,"Button",BS_AUTORADIOBUTTON,111,69,66,10
-    CONTROL         "Samba-CAP",HSET_FN_SMC_CNV,"Button",BS_AUTORADIOBUTTON,111,81,64,10
-    CONTROL         "UTF-8",HSET_FN_UTF8N_CNV,"Button",BS_AUTORADIOBUTTON,111,93,63,10
-    CONTROL         "Hankaku to Zenkaku",HSET_FN_HANCNV,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,111,108,91,10
+    CONTROL         "Shift_JIS",HSET_FN_SJIS_CNV,"Button",BS_AUTORADIOBUTTON,111,33,81,10
+    CONTROL         "JIS",HSET_FN_JIS_CNV,"Button",BS_AUTORADIOBUTTON,111,45,81,10
+    CONTROL         "EUC",HSET_FN_EUC_CNV,"Button",BS_AUTORADIOBUTTON,111,57,81,10
+    CONTROL         "Samba-HEX",HSET_FN_SMH_CNV,"Button",BS_AUTORADIOBUTTON,111,69,81,10
+    CONTROL         "Samba-CAP",HSET_FN_SMC_CNV,"Button",BS_AUTORADIOBUTTON,111,81,81,10
+    CONTROL         "UTF-8",HSET_FN_UTF8N_CNV,"Button",BS_AUTORADIOBUTTON,111,93,81,10
+    CONTROL         "UTF-8 HFS+",HSET_FN_UTF8HFSX_CNV,"Button",BS_AUTORADIOBUTTON,111,105,81,10
+    CONTROL         "Hankaku to Zenkaku",HSET_FN_HANCNV,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,111,119,81,10
 END
 
 opt_trmode1_dlg DIALOG  0, 0, 211, 155

--- a/Resource_eng/resource.h
+++ b/Resource_eng/resource.h
@@ -460,6 +460,7 @@
 #define TRMODE4_UTF8N_CNV               1218
 #define TRMODE4_UTF8BOM_CNV             1219
 #define HSET_ERROR_RECONNECT            1220
+#define HSET_FN_UTF8HFSX_CNV            1221
 #define MENU_END                        40001
 #define MENU_EXIT                       40001
 #define MENU_CONNECT                    40003

--- a/codecnv.c
+++ b/codecnv.c
@@ -36,6 +36,8 @@
 #include <winsock2.h>
 #include <mbstring.h>
 #include <windowsx.h>
+// UTF-8対応
+#include <winnls.h>
 
 #include "common.h"
 #include "resource.h"
@@ -61,6 +63,19 @@ static int CheckOnEUC(uchar *Pos, uchar *Btm);
 static int ConvertIBMExtendedChar(int code);
 
 
+typedef enum _NORM_FORM
+{
+	NormalizationOther = 0,
+	NormalizationC = 0x1,
+	NormalizationD = 0x2,
+	NormalizationKC = 0x5,
+	NormalizationKD = 0x6
+} NORM_FORM;
+
+typedef int (WINAPI* _NormalizeString)(NORM_FORM, LPCWSTR, int, LPWSTR, int);
+
+HMODULE hUnicodeNormalizationDll;
+_NormalizeString p_NormalizeString;
 
 #if 0
 /*----- 漢字コード変換のテストプログラム ------------------------------------*/
@@ -1844,6 +1859,242 @@ int ConvSJIStoUTF8N(CODECONVINFO *cInfo)
 }
 // UTF-8対応 ここまで↑
 
+// UTF-8 HFS+対応
+int ConvUTF8NtoUTF8HFSX(CODECONVINFO *cInfo)
+{
+	int Continue;
+	int SrcLength;
+	char* pSrc;
+	char* pSrcCur;
+	char* pSrcEnd;
+	char* pSrcNext;
+	char* pDstCur;
+	char* pDstEnd;
+	DWORD Code;
+	int Count;
+	wchar_t Temp1[4];
+	wchar_t Temp2[4];
+	char Temp3[16];
+	char* Temp3Cur;
+	char* Temp3End;
+	int TempCount;
+	Continue = NO;
+	SrcLength = cInfo->StrLen + cInfo->EscUTF8Len;
+	if(!(pSrc = (char*)malloc(sizeof(char) * (SrcLength + 1))))
+	{
+		*(cInfo->Buf) = '\0';
+		cInfo->BufSize = 0;
+		return Continue;
+	}
+	memcpy(pSrc, cInfo->EscUTF8, sizeof(char) * cInfo->EscUTF8Len);
+	memcpy(pSrc + cInfo->EscUTF8Len, cInfo->Str, sizeof(char) * cInfo->StrLen);
+	*(pSrc + SrcLength) = '\0';
+	cInfo->OutLen = 0;
+	pSrcCur = pSrc;
+	pSrcEnd = pSrc + SrcLength;
+	pSrcNext = pSrc;
+	pDstCur = cInfo->Buf;
+	pDstEnd = cInfo->Buf + cInfo->BufSize;
+	while(pSrcCur < pSrcEnd)
+	{
+		Code = GetNextCharM(pSrcCur, pSrcEnd, (LPCSTR*)&pSrcNext);
+		if(Code == 0x80000000)
+		{
+			if(pSrcNext == pSrcEnd)
+				// 入力の末尾が不完全
+				break;
+		}
+		else if((Code >= 0x00002000 && Code <= 0x00002fff)
+			|| (Code >= 0x0000f900 && Code <= 0x0000faff)
+			|| (Code >= 0x0002f800 && Code <= 0x0002faff))
+		{
+			// HFS+特有の例外
+			Count = PutNextCharM(pDstCur, pDstEnd, &pDstCur, Code);
+			if(Count > 0)
+				cInfo->OutLen += Count;
+			else
+			{
+				// 出力バッファが不足
+				Continue = YES;
+				break;
+			}
+		}
+		else
+		{
+			// Normalization Form Dに変換
+			Count = MultiByteToWideChar(CP_UTF8, 0, pSrcCur, (int)(pSrcNext - pSrcCur), Temp1, 4);
+			Count = p_NormalizeString(NormalizationD, Temp1, Count, Temp2, 4);
+			Count = WideCharToMultiByte(CP_UTF8, 0, Temp2, Count, Temp3, 16, NULL, NULL);
+			Temp3Cur = Temp3;
+			Temp3End = Temp3 + Count;
+			TempCount = 0;
+			while(Temp3Cur < Temp3End)
+			{
+				Code = GetNextCharM(Temp3Cur, Temp3End, (LPCSTR*)&Temp3Cur);
+				Count = PutNextCharM(pDstCur, pDstEnd, &pDstCur, Code);
+				if(Count > 0)
+					TempCount += Count;
+				else
+				{
+					// 出力バッファが不足
+					Continue = YES;
+					break;
+				}
+			}
+			cInfo->OutLen += TempCount;
+		}
+		pSrcCur = pSrcNext;
+	}
+	cInfo->Str += (int)(pSrcCur - pSrc) - cInfo->EscUTF8Len;
+	cInfo->StrLen -= (int)(pSrcCur - pSrc) - cInfo->EscUTF8Len;
+	cInfo->EscUTF8Len = 0;
+	free(pSrc);
+	if(Continue == NO)
+	{
+		memcpy(cInfo->EscUTF8, cInfo->Str, sizeof(char) * cInfo->StrLen);
+		cInfo->EscUTF8Len = cInfo->StrLen;
+		cInfo->Str += cInfo->StrLen;
+		cInfo->StrLen = 0;
+		cInfo->FlushProc = ConvUTF8NtoUTF8HFSX;
+	}
+	return YES;
+}
+
+// バグの可能性あり
+// 確認するまで複数個のバッファを用いた変換には用いないこと
+// UTF-8 Nomalization Form DからCへの変換後のバイト列が確定可能な長さを変換後のコードポイントの個数で返す
+// バイナリ            UTF-8       戻り値
+// E3 81 82 E3 81 84   あい     -> 1   あ+結合文字の先頭バイトの可能性（い゛等）
+// E3 81 82 E3 81      あ+E3 81 -> 0   結合文字の先頭バイトの可能性
+// E3 81 82 E3         あ+E3    -> 0   結合文字の先頭バイトの可能性
+// E3 81 82            あ       -> 0   結合文字の先頭バイトの可能性
+int ConvUTF8HFSXtoUTF8N_TruncateToDelimiter(char* pUTF8, int UTF8Length, int* pNewUTF8Length)
+{
+	int UTF16Length;
+	wchar_t* pUTF16;
+	int UTF16HFSXLength;
+	wchar_t* pUTF16HFSX;
+	int CodeCount;
+	int NewCodeCount;
+	int NewUTF16Length;
+	UTF16Length = MultiByteToWideChar(CP_UTF8, 0, pUTF8, UTF8Length, NULL, 0);
+	if(!(pUTF16 = (wchar_t*)malloc(sizeof(wchar_t) * UTF16Length)))
+		return -1;
+	UTF16Length = MultiByteToWideChar(CP_UTF8, 0, pUTF8, UTF8Length, pUTF16, UTF16Length);
+	UTF16HFSXLength = p_NormalizeString(NormalizationC, pUTF16, UTF16Length, NULL, 0);
+	if(!(pUTF16HFSX = (wchar_t*)malloc(sizeof(wchar_t) * UTF16HFSXLength)))
+	{
+		free(pUTF16);
+		return -1;
+	}
+	UTF16HFSXLength = p_NormalizeString(NormalizationC, pUTF16, UTF16Length, pUTF16HFSX, UTF16HFSXLength);
+	// 変換した時にコードポイントの個数が増減する位置がUnicode結合文字の区切り
+	CodeCount = GetCodeCountW(pUTF16HFSX, UTF16HFSXLength);
+	NewCodeCount = CodeCount;
+	while(UTF8Length > 0 && NewCodeCount >= CodeCount)
+	{
+		UTF8Length--;
+		UTF16Length = MultiByteToWideChar(CP_UTF8, 0, pUTF8, UTF8Length, pUTF16, UTF16Length);
+		UTF16HFSXLength = p_NormalizeString(NormalizationC, pUTF16, UTF16Length, pUTF16HFSX, UTF16HFSXLength);
+		NewCodeCount = GetCodeCountW(pUTF16HFSX, UTF16HFSXLength);
+	}
+	free(pUTF16);
+	free(pUTF16HFSX);
+	// UTF-16 LE変換した時に文字数が増減する位置がUTF-8の区切り
+	if(pNewUTF8Length)
+	{
+		NewUTF16Length = UTF16Length;
+		while(UTF8Length > 0 && NewUTF16Length >= UTF16Length)
+		{
+			UTF8Length--;
+			NewUTF16Length = MultiByteToWideChar(CP_UTF8, 0, pUTF8, UTF8Length, NULL, 0);
+		}
+		if(UTF16Length > 0)
+			UTF8Length++;
+		*pNewUTF8Length = UTF8Length;
+	}
+	return NewCodeCount;
+}
+
+int ConvUTF8HFSXtoUTF8N(CODECONVINFO *cInfo)
+{
+	int Continue;
+	int SrcLength;
+	char* pSrc;
+	int UTF16Length;
+	wchar_t* pUTF16;
+	int UTF16HFSXLength;
+	wchar_t* pUTF16HFSX;
+	CODECONVINFO Temp;
+	int Count;
+	Continue = NO;
+	// 前回の変換不能な残りの文字列を入力の先頭に結合
+	SrcLength = cInfo->StrLen + cInfo->EscUTF8Len;
+	if(!(pSrc = (char*)malloc(sizeof(char) * (SrcLength + 1))))
+	{
+		*(cInfo->Buf) = '\0';
+		cInfo->BufSize = 0;
+		return Continue;
+	}
+	memcpy(pSrc, cInfo->EscUTF8, sizeof(char) * cInfo->EscUTF8Len);
+	memcpy(pSrc + cInfo->EscUTF8Len, cInfo->Str, sizeof(char) * cInfo->StrLen);
+	*(pSrc + SrcLength) = '\0';
+	UTF16Length = MultiByteToWideChar(CP_UTF8, 0, pSrc, SrcLength, NULL, 0);
+	if(!(pUTF16 = (wchar_t*)malloc(sizeof(wchar_t) * UTF16Length)))
+	{
+		free(pSrc);
+		*(cInfo->Buf) = '\0';
+		cInfo->BufSize = 0;
+		return Continue;
+	}
+	MultiByteToWideChar(CP_UTF8, 0, pSrc, SrcLength, pUTF16, UTF16Length);
+	UTF16HFSXLength = p_NormalizeString(NormalizationC, pUTF16, UTF16Length, NULL, 0);
+	if(!(pUTF16HFSX = (wchar_t*)malloc(sizeof(wchar_t) * UTF16HFSXLength)))
+	{
+		free(pSrc);
+		free(pUTF16);
+		*(cInfo->Buf) = '\0';
+		cInfo->BufSize = 0;
+		return Continue;
+	}
+	UTF16HFSXLength = p_NormalizeString(NormalizationC, pUTF16, UTF16Length, pUTF16HFSX, UTF16HFSXLength);
+	cInfo->OutLen = WideCharToMultiByte(CP_UTF8, 0, pUTF16HFSX, UTF16HFSXLength, cInfo->Buf, cInfo->BufSize, NULL, NULL);
+	if(cInfo->OutLen == 0 && UTF16HFSXLength > 0)
+	{
+		// バッファに収まらないため変換文字数を半減
+		Temp = *cInfo;
+		Temp.StrLen = cInfo->StrLen / 2;
+		ConvUTF8HFSXtoUTF8N(&Temp);
+		cInfo->OutLen = Temp.OutLen;
+		Count = cInfo->StrLen / 2 + cInfo->EscUTF8Len - Temp.StrLen - Temp.EscUTF8Len;
+		cInfo->Str += Count - cInfo->EscUTF8Len;
+		cInfo->StrLen -= Count - cInfo->EscUTF8Len;
+		cInfo->EscUTF8Len = 0;
+	}
+	else
+	{
+		cInfo->Str += SrcLength - cInfo->EscUTF8Len;
+		cInfo->StrLen -= SrcLength - cInfo->EscUTF8Len;
+		cInfo->EscUTF8Len = 0;
+	}
+	if(ConvUTF8HFSXtoUTF8N_TruncateToDelimiter(cInfo->Str, cInfo->StrLen, NULL) > 0)
+		Continue = YES;
+	else
+	{
+		// 変換不能なため次の入力の先頭に結合
+		memcpy(cInfo->EscUTF8, cInfo->Str, sizeof(char) * cInfo->StrLen);
+		cInfo->EscUTF8Len = cInfo->StrLen;
+		cInfo->Str += cInfo->StrLen;
+		cInfo->StrLen = 0;
+		cInfo->FlushProc = ConvUTF8HFSXtoUTF8N;
+		Continue = NO;
+	}
+	free(pSrc);
+	free(pUTF16);
+	free(pUTF16HFSX);
+	return Continue;
+}
+
 
 /*----- IBM拡張漢字をNEC選定IBM拡張漢字等に変換 -------------------------------
 *
@@ -1873,3 +2124,45 @@ static int ConvertIBMExtendedChar(int code)
 	return code;
 }
 
+// UTF-8対応
+int LoadUnicodeNormalizationDll()
+{
+	int Sts;
+	char CurDir[FMAX_PATH+1];
+	char SysDir[FMAX_PATH+1];
+	Sts = FFFTP_FAIL;
+	if(GetCurrentDirectory(FMAX_PATH, CurDir) > 0)
+	{
+		if(GetSystemDirectory(SysDir, FMAX_PATH) > 0)
+		{
+			if(SetCurrentDirectory(SysDir))
+			{
+				if((hUnicodeNormalizationDll = LoadLibrary("normaliz.dll")) != NULL)
+				{
+					if((p_NormalizeString = (_NormalizeString)GetProcAddress(hUnicodeNormalizationDll, "NormalizeString")) != NULL)
+						Sts = FFFTP_SUCCESS;
+				}
+				SetCurrentDirectory(CurDir);
+			}
+		}
+	}
+	return Sts;
+}
+
+void FreeUnicodeNormalizationDll()
+{
+	if(hUnicodeNormalizationDll != NULL)
+		FreeLibrary(hUnicodeNormalizationDll);
+	hUnicodeNormalizationDll = NULL;
+	p_NormalizeString = NULL;
+}
+
+int IsUnicodeNormalizationDllLoaded()
+{
+	int Sts;
+	Sts = FFFTP_FAIL;
+	if(hUnicodeNormalizationDll != NULL && p_NormalizeString != NULL)
+		Sts = FFFTP_SUCCESS;
+	return Sts;
+}
+

--- a/common.h
+++ b/common.h
@@ -746,6 +746,8 @@ LIST_UNIX_70
 #define KANJI_UTF8N		5		/* UTF-8 */
 // UTF-8対応
 #define KANJI_UTF8BOM		6		/* UTF-8 BOM */
+// UTF-8 HFS+対応
+#define KANJI_UTF8HFSX		7		/* UTF-8 HFS+ */
 
 #define KANJI_NOCNV		-1		/* 漢字コード変換なし */
 
@@ -1735,8 +1737,15 @@ int ConvSJIStoJIS(CODECONVINFO *cInfo);
 int ConvSJIStoSMB_HEX(CODECONVINFO *cInfo);
 int ConvSJIStoSMB_CAP(CODECONVINFO *cInfo);
 int ConvSJIStoUTF8N(CODECONVINFO *cInfo); // UTF-8対応
+// UTF-8 HFS+対応
+int ConvUTF8NtoUTF8HFSX(CODECONVINFO *cInfo);
+int ConvUTF8HFSXtoUTF8N(CODECONVINFO *cInfo);
 void ConvAutoToSJIS(char *Text, int Pref);
 int CheckKanjiCode(char *Text, int Size, int Pref);
+// UTF-8対応
+int LoadUnicodeNormalizationDll();
+void FreeUnicodeNormalizationDll();
+int IsUnicodeNormalizationDllLoaded();
 
 /*===== option.c =====*/
 

--- a/connect.c
+++ b/connect.c
@@ -1865,8 +1865,10 @@ static SOCKET DoConnectCrypt(int CryptMode, HOSTDATA* HostData, char *Host, char
 			// UTF-8対応
 			if(HostData->CurNameKanjiCode == KANJI_AUTO && (HostData->Feature & FEATURE_UTF8))
 			{
-				if((Sts = command(ContSock, Reply, CancelCheckWork, "OPTS UTF8 ON")) == 200)
-					HostData->CurNameKanjiCode = KANJI_UTF8N;
+				// UTF-8を指定した場合も自動判別を行う
+//				if((Sts = command(ContSock, Reply, CancelCheckWork, "OPTS UTF8 ON")) == 200)
+//					HostData->CurNameKanjiCode = KANJI_UTF8N;
+				command(ContSock, Reply, CancelCheckWork, "OPTS UTF8 ON");
 			}
 		}
 	}

--- a/filelist.c
+++ b/filelist.c
@@ -6144,7 +6144,7 @@ static int atoi_n(const char *Str, int Len)
 
 // UTF-8対応
 // ファイル一覧から漢字コードを推測
-// 優先度はUTF-8、Shift_JIS、EUC、JISの順
+// 優先度はUTF-8、Shift_JIS、EUC、JIS、UTF-8 HFS+の順
 int AnalyzeNameKanjiCode(int Num)
 {
 	char Str[FMAX_PATH+1];
@@ -6164,7 +6164,11 @@ int AnalyzeNameKanjiCode(int Num)
 	int PointJIS;
 	int PointEUC;
 	int PointUTF8N;
+	int PointUTF8HFSX;
 	char* p;
+	CODECONVINFO cInfo1;
+	CODECONVINFO cInfo2;
+	char Buf[FMAX_PATH+1];
 
 	NameKanjiCode = KANJI_AUTO;
 	Point = 0;
@@ -6172,6 +6176,7 @@ int AnalyzeNameKanjiCode(int Num)
 	PointJIS = 0;
 	PointEUC = 0;
 	PointUTF8N = 0;
+	PointUTF8HFSX = 0;
 	MakeCacheFileName(Num, Str);
 	if((fd = fopen(Str, "rb")) != NULL)
 	{
@@ -6194,7 +6199,25 @@ int AnalyzeNameKanjiCode(int Num)
 				if(!p)
 				{
 					if(!CheckStringM(Name))
-						PointUTF8N++;
+					{
+						InitCodeConvInfo(&cInfo1);
+						cInfo1.KanaCnv = NO;
+						cInfo1.Str = Name;
+						cInfo1.StrLen = strlen(Name);
+						cInfo1.Buf = Buf;
+						cInfo1.BufSize = FMAX_PATH;
+						cInfo2 = cInfo1;
+						ConvUTF8NtoUTF8HFSX(&cInfo1);
+						ConvUTF8HFSXtoUTF8N(&cInfo2);
+						if(cInfo1.OutLen > strlen(Name))
+							PointUTF8N++;
+						else
+							PointUTF8HFSX++;
+						if(cInfo2.OutLen < strlen(Name))
+							PointUTF8HFSX++;
+						else
+							PointUTF8N++;
+					}
 					else
 					{
 						switch(CheckKanjiCode(Name, strlen(Name), KANJI_SJIS))
@@ -6215,6 +6238,11 @@ int AnalyzeNameKanjiCode(int Num)
 		}
 		fclose(fd);
 	}
+	if(PointUTF8HFSX >= Point)
+	{
+		NameKanjiCode = KANJI_UTF8HFSX;
+		Point = PointUTF8HFSX;
+	}
 	if(PointJIS >= Point)
 	{
 		NameKanjiCode = KANJI_JIS;

--- a/hostman.c
+++ b/hostman.c
@@ -1938,7 +1938,10 @@ static INT_PTR CALLBACK CodeSettingProc(HWND hDlg, UINT iMessage, WPARAM wParam,
 		{ HSET_FN_EUC_CNV, KANJI_EUC },
 		{ HSET_FN_SMH_CNV, KANJI_SMB_HEX },
 		{ HSET_FN_SMC_CNV, KANJI_SMB_CAP },
-		{ HSET_FN_UTF8N_CNV, KANJI_UTF8N }		// UTF-8対応
+		// UTF-8 HFS+対応
+//		{ HSET_FN_UTF8N_CNV, KANJI_UTF8N }		// UTF-8対応
+		{ HSET_FN_UTF8N_CNV, KANJI_UTF8N },		// UTF-8対応
+		{ HSET_FN_UTF8HFSX_CNV, KANJI_UTF8HFSX }
 	};
 	#define NAMEKANJIBUTTONS	(sizeof(NameKanjiButton)/sizeof(RADIOBUTTON))
 
@@ -1998,6 +2001,8 @@ static INT_PTR CALLBACK CodeSettingProc(HWND hDlg, UINT iMessage, WPARAM wParam,
 				case HSET_FN_SMH_CNV :
 				case HSET_FN_SMC_CNV :
 				case HSET_FN_UTF8N_CNV :	// UTF-8対応
+				// UTF-8 HFS+対応
+				case HSET_FN_UTF8HFSX_CNV :
 					EnableWindow(GetDlgItem(hDlg, HSET_FN_HANCNV), FALSE);
 					break;
 			}

--- a/main.c
+++ b/main.c
@@ -372,6 +372,9 @@ int PASCAL WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpszCmdLi
 	CoInitialize(NULL);
 	LoadUPnP();
 
+	// UTF-8対応
+	LoadUnicodeNormalizationDll();
+
 	// FTPS対応
 #ifdef USE_OPENSSL
 	LoadOpenSSL();

--- a/mbswrapper.c
+++ b/mbswrapper.c
@@ -578,6 +578,48 @@ int PutNextCharW(LPWSTR lpString, LPWSTR pLimit, LPWSTR* ppNext, DWORD Code)
 	return Count;
 }
 
+// マルチバイト文字列のコードポイントの個数を取得
+int GetCodeCountM(LPCSTR lpString, int CharCount)
+{
+	int Count;
+	LPCSTR pLimit;
+	DWORD Code;
+	Count = 0;
+	if(CharCount == -1)
+		pLimit = lpString + strlen(lpString);
+	else
+		pLimit = lpString + CharCount;
+	while(lpString < pLimit)
+	{
+		Code = GetNextCharM(lpString, pLimit, &lpString);
+		if(Code == 0x80000000)
+			continue;
+		Count++;
+	}
+	return Count;
+}
+
+// ワイド文字列のコードポイントの個数を取得
+int GetCodeCountW(LPCWSTR lpString, int CharCount)
+{
+	int Count;
+	LPCWSTR pLimit;
+	DWORD Code;
+	Count = 0;
+	if(CharCount == -1)
+		pLimit = lpString + wcslen(lpString);
+	else
+		pLimit = lpString + CharCount;
+	while(lpString < pLimit)
+	{
+		Code = GetNextCharW(lpString, pLimit, &lpString);
+		if(Code == 0x80000000)
+			continue;
+		Count++;
+	}
+	return Count;
+}
+
 // マルチバイト文字列の冗長表現を修正
 // 修正があればTRUEを返す
 // 修正後の文字列の長さは元の文字列の長さ以下のためpDstとpSrcに同じ値を指定可能

--- a/mbswrapper.h
+++ b/mbswrapper.h
@@ -282,6 +282,8 @@ DWORD GetNextCharM(LPCSTR lpString, LPCSTR pLimit, LPCSTR* ppNext);
 int PutNextCharM(LPSTR lpString, LPSTR pLimit, LPSTR* ppNext, DWORD Code);
 DWORD GetNextCharW(LPCWSTR lpString, LPCWSTR pLimit, LPCWSTR* ppNext);
 int PutNextCharW(LPWSTR lpString, LPWSTR pLimit, LPWSTR* ppNext, DWORD Code);
+int GetCodeCountM(LPCSTR lpString, int CharCount);
+int GetCodeCountW(LPCWSTR lpString, int CharCount);
 BOOL FixStringM(LPSTR pDst, LPCSTR pSrc);
 BOOL FixMultiStringM(LPSTR pDst, LPCSTR pSrc);
 BOOL CheckStringM(LPCSTR lpString);

--- a/remote.c
+++ b/remote.c
@@ -1655,6 +1655,20 @@ int ChangeFnameRemote2Local(char *Fname, int Max)
 //				*(Buf + cInfo.OutLen) = NUL;
 //				strcpy(Pos, Buf);
 //				break;
+
+			// UTF-8 HFS+対応
+			case KANJI_UTF8HFSX :
+				if(IsUnicodeNormalizationDllLoaded())
+				{
+					ConvUTF8HFSXtoUTF8N(&cInfo);
+					*(Buf + cInfo.OutLen) = NUL;
+					strcpy(Fname, Buf);
+					Pos = strchr(Fname, NUL);
+					FlushRestData(&cInfo);
+					*(Buf + cInfo.OutLen) = NUL;
+					strcpy(Pos, Buf);
+				}
+				break;
 		}
 		// バッファ上書きバグ対策
 		free(Buf2);
@@ -1823,6 +1837,20 @@ int ChangeFnameLocal2Remote(char *Fname, int Max)
 //				*(Buf + cInfo.OutLen) = NUL;
 //				strcpy(Pos, Buf);
 //				break;
+
+			// UTF-8 HFS+対応
+			case KANJI_UTF8HFSX :
+				if(IsUnicodeNormalizationDllLoaded())
+				{
+					ConvUTF8NtoUTF8HFSX(&cInfo);
+					*(Buf + cInfo.OutLen) = NUL;
+					strcpy(Fname, Buf);
+					Pos = strchr(Fname, NUL);
+					FlushRestData(&cInfo);
+					*(Buf + cInfo.OutLen) = NUL;
+					strcpy(Pos, Buf);
+				}
+				break;
 		}
 		// バッファ上書きバグ対策
 		free(Buf2);