コミット: c77292a7a46ba795cbc2a728f1ecdfbbc39811bc - ffftp (git)

Loweynet

コミットメタ情報

• リビジョン: c77292a7a46ba795cbc2a728f1ecdfbbc39811bc (tree)
• 日時: 2011-09-15 09:31:52
• 作者: s_kawamoto <s_kawamoto@user...>
• コミッター: s_kawamoto

ログメッセージ

Fix small bugs (they usually do not occur).

変更サマリ

• modified: FFFTP_Eng_Release/FFFTP.exe
• modified: Package/FFFTP.exe
• modified: Release/FFFTP.exe
• modified: main.c
• modified: mbswrapper.c
• modified: mbswrapper.h
• modified: remote.c
• modified: socketwrapper.c

差分

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

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

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

--- a/main.c
+++ b/main.c
@@ -413,7 +413,9 @@ static int InitApp(LPSTR lpszCmdLine, int cmdShow)
 				DispTransferType();
 				SetHostKanaCnvImm(YES);
 				SetHostKanjiCodeImm(KANJI_NOCNV);
-				SetLocalKanjiCodeImm(KANJI_UTF8N);
+				// –{“–‚̓[ƒJƒ‹‚̃fƒtƒHƒ‹ƒg‚ðUTF-8‚É‚µ‚½‚¢‚ª‹Œƒo[ƒWƒ‡ƒ“‚Ƃ̌݊·«‚Ì‚½‚ßShift_JIS‚ɐݒè
+//				SetLocalKanjiCodeImm(KANJI_UTF8N);
+				SetLocalKanjiCodeImm(KANJI_SJIS);
 				DispListType();
 				DispDotFileMode();
 				DispSyncMoveMode();

--- a/mbswrapper.c
+++ b/mbswrapper.c
@@ -82,6 +82,22 @@ int TerminateStringW(LPWSTR lpString, int size)
 	return i;
 }
 
+// Shift_JIS•¶Žš—ñƒoƒbƒtƒ@I’[‚ð‹­§“I‚ÉNULL‚Å’uŠ·
+int TerminateStringA(LPSTR lpString, int size)
+{
+	int i;
+	if(lpString < (LPSTR)0x00010000 || lpString == (LPSTR)~0)
+		return 0;
+	for(i = 0; i < size; i++)
+	{
+		if(lpString[i] == '\0')
+			return i;
+	}
+	i--;
+	lpString[i] = '\0';
+	return i;
+}
+
 // NULL‹æØ‚è•¡”ƒ}ƒ‹ƒ`ƒoƒCƒg•¶Žš—ñ‚Ì’·‚³‚ðŽæ“¾
 size_t GetMultiStringLengthM(LPCSTR lpString)
 {
@@ -112,6 +128,21 @@ size_t GetMultiStringLengthW(LPCWSTR lpString)
 	return i;
 }
 
+// NULL‹æØ‚è•¡”Shift_JIS•¶Žš—ñ‚Ì’·‚³‚ðŽæ“¾
+size_t GetMultiStringLengthA(LPCSTR lpString)
+{
+	size_t i;
+	if(lpString < (LPCSTR)0x00010000 || lpString == (LPCSTR)~0)
+		return 0;
+	i = 0;
+	while(lpString[i] != '\0' || lpString[i + 1] != '\0')
+	{
+		i++;
+	}
+	i++;
+	return i;
+}
+
 // NULL‹æØ‚èƒ}ƒ‹ƒ`ƒoƒCƒg•¶Žš—ñ‚©‚烏ƒCƒh•¶Žš—ñ‚Ö•ÏŠ·
 int MtoWMultiString(LPWSTR pDst, int size, LPCSTR pSrc)
 {
@@ -148,7 +179,7 @@ int WtoMMultiString(LPSTR pDst, int size, LPCWSTR pSrc)
 	return i;
 }
 
-// NULL‹æØ‚胏ƒCƒh•¶Žš—ñ‚©‚çƒ}ƒ‹ƒ`ƒoƒCƒg•¶Žš—ñ‚Ö•ÏŠ·
+// NULL‹æØ‚胏ƒCƒh•¶Žš—ñ‚©‚çShift_JIS•¶Žš—ñ‚Ö•ÏŠ·
 int WtoAMultiString(LPSTR pDst, int size, LPCWSTR pSrc)
 {
 	int i;

--- a/mbswrapper.h
+++ b/mbswrapper.h
@@ -136,8 +136,13 @@ int WtoM(LPSTR pDst, int size, LPCWSTR pSrc, int count);
 int WtoA(LPSTR pDst, int size, LPCWSTR pSrc, int count);
 int TerminateStringM(LPSTR lpString, int size);
 int TerminateStringW(LPWSTR lpString, int size);
+int TerminateStringA(LPWSTR lpString, int size);
 size_t GetMultiStringLengthM(LPCSTR lpString);
 size_t GetMultiStringLengthW(LPCWSTR lpString);
+size_t GetMultiStringLengthA(LPCWSTR lpString);
+int MtoWMultiString(LPWSTR pDst, int size, LPCSTR pSrc);
+int WtoMMultiString(LPSTR pDst, int size, LPCWSTR pSrc);
+int WtoAMultiString(LPSTR pDst, int size, LPCWSTR pSrc);
 char* AllocateStringM(int size);
 wchar_t* AllocateStringW(int size);
 char* AllocateStringA(int size);

--- a/remote.c
+++ b/remote.c
@@ -1340,8 +1340,8 @@ int ChangeFnameRemote2Local(char *Fname, int Max)
 				// TODO
 				InitCodeConvInfo(&cInfo);
 				cInfo.KanaCnv = NO;
-				cInfo.Str = Pos;
-				cInfo.StrLen = strlen(Pos);
+				cInfo.Str = Fname;
+				cInfo.StrLen = strlen(Fname);
 				cInfo.Buf = Buf;
 				cInfo.BufSize = Max - 1;
 				ConvSJIStoUTF8N(&cInfo);
@@ -1364,8 +1364,8 @@ int ChangeFnameRemote2Local(char *Fname, int Max)
 				// TODO
 				InitCodeConvInfo(&cInfo);
 				cInfo.KanaCnv = NO;
-				cInfo.Str = Pos;
-				cInfo.StrLen = strlen(Pos);
+				cInfo.Str = Fname;
+				cInfo.StrLen = strlen(Fname);
 				cInfo.Buf = Buf;
 				cInfo.BufSize = Max - 1;
 				ConvSJIStoUTF8N(&cInfo);
@@ -1389,8 +1389,8 @@ int ChangeFnameRemote2Local(char *Fname, int Max)
 				// TODO
 				InitCodeConvInfo(&cInfo);
 				cInfo.KanaCnv = NO;
-				cInfo.Str = Pos;
-				cInfo.StrLen = strlen(Pos);
+				cInfo.Str = Fname;
+				cInfo.StrLen = strlen(Fname);
 				cInfo.Buf = Buf;
 				cInfo.BufSize = Max - 1;
 				ConvSJIStoUTF8N(&cInfo);
@@ -1472,8 +1472,8 @@ int ChangeFnameLocal2Remote(char *Fname, int Max)
 				// TODO
 				InitCodeConvInfo(&cInfo);
 				cInfo.KanaCnv = NO;
-				cInfo.Str = Pos;
-				cInfo.StrLen = strlen(Pos);
+				cInfo.Str = Fname;
+				cInfo.StrLen = strlen(Fname);
 				cInfo.Buf = Buf;
 				cInfo.BufSize = Max - 1;
 				ConvSJIStoJIS(&cInfo);
@@ -1496,8 +1496,8 @@ int ChangeFnameLocal2Remote(char *Fname, int Max)
 				// TODO
 				InitCodeConvInfo(&cInfo);
 				cInfo.KanaCnv = NO;
-				cInfo.Str = Pos;
-				cInfo.StrLen = strlen(Pos);
+				cInfo.Str = Fname;
+				cInfo.StrLen = strlen(Fname);
 				cInfo.Buf = Buf;
 				cInfo.BufSize = Max - 1;
 				ConvSJIStoEUC(&cInfo);
@@ -1520,8 +1520,8 @@ int ChangeFnameLocal2Remote(char *Fname, int Max)
 				// TODO
 				InitCodeConvInfo(&cInfo);
 				cInfo.KanaCnv = NO;
-				cInfo.Str = Pos;
-				cInfo.StrLen = strlen(Pos);
+				cInfo.Str = Fname;
+				cInfo.StrLen = strlen(Fname);
 				cInfo.Buf = Buf;
 				cInfo.BufSize = Max - 1;
 				ConvSJIStoSMB_HEX(&cInfo);
@@ -1544,8 +1544,8 @@ int ChangeFnameLocal2Remote(char *Fname, int Max)
 				// TODO
 				InitCodeConvInfo(&cInfo);
 				cInfo.KanaCnv = NO;
-				cInfo.Str = Pos;
-				cInfo.StrLen = strlen(Pos);
+				cInfo.Str = Fname;
+				cInfo.StrLen = strlen(Fname);
 				cInfo.Buf = Buf;
 				cInfo.BufSize = Max - 1;
 				ConvSJIStoSMB_CAP(&cInfo);

--- a/socketwrapper.c
+++ b/socketwrapper.c
@@ -200,7 +200,11 @@ BOOL AttachSSL(SOCKET s)
 					}
 				}
 				else
+				{
+					LeaveCriticalSection(&g_OpenSSLLock);
 					DetachSSL(s);
+					EnterCriticalSection(&g_OpenSSLLock);
+				}
 			}
 		}
 	}