Commit: 7677acb145ecb0ef18f09f561740f08841f36f62 - ffftp (git)

FFFTPのソースコードです。

Commit MetaInfo

• Revisão: 7677acb145ecb0ef18f09f561740f08841f36f62 (tree)
• Hora: 2011-11-04 20:13:10
• Autor: s_kawamoto <s_kawamoto@user...>
• Commiter: s_kawamoto

Mensagem de Log

Fix bugs of character code conversion of filenames.
Enhance routines for canceling or aborting.

Mudança Sumário

• modified: FFFTP_Eng_Release/FFFTP.exe
• modified: Release/FFFTP.exe
• modified: filelist.c
• modified: main.c
• 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/filelist.c
+++ b/filelist.c
@@ -4830,11 +4830,12 @@ static int ResolvFileInfo(char *Str, int ListType, char *Fname, LONGLONG *Size,
 
 				if(strchr("dl", *Str) != NULL)
 				{
-					if((_mbscmp(_mbsninc(Fname, _mbslen(Fname) - 1), "/") == 0) ||
-					   (_mbscmp(_mbsninc(Fname, _mbslen(Fname) - 1), "\\") == 0))
-					{
-						*(Fname + strlen(Fname) - 1) = NUL;
-					}
+					// 0x5Cが含まれる文字列を扱えないバグ修正
+//					if((_mbscmp(_mbsninc(Fname, _mbslen(Fname) - 1), "/") == 0) ||
+//					   (_mbscmp(_mbsninc(Fname, _mbslen(Fname) - 1), "\\") == 0))
+//					{
+//						*(Fname + strlen(Fname) - 1) = NUL;
+//					}
 					Ret = NODE_DIR;
 					if(*Str == 'l')
 						*Link = YES;
@@ -4904,6 +4905,10 @@ static int ResolvFileInfo(char *Str, int ListType, char *Fname, LONGLONG *Size,
 			Ret = NODE_NONE;
 		else
 			ChangeFnameRemote2Local(Fname, FMAX_PATH);
+		// 0x5Cが含まれる文字列を扱えないバグ修正
+		if((_mbscmp(_mbsninc(Fname, _mbslen(Fname) - 1), "/") == 0)
+			|| (_mbscmp(_mbsninc(Fname, _mbslen(Fname) - 1), "\\") == 0))
+			*(Fname + strlen(Fname) - 1) = NUL;
 	}
 	return(Ret);
 }

--- a/main.c
+++ b/main.c
@@ -2151,6 +2151,11 @@ static void ChangeDir(int Win, char *Path)
 	char Local[FMAX_PATH+1];
 	char Remote[FMAX_PATH+1];
 
+	// 同時接続対応
+	CancelFlg = NO;
+
+	// デッドロック対策
+	DisableUserOpe();
 	Sync = AskSyncMoveMode();
 	if(Sync == YES)
 	{
@@ -2182,6 +2187,8 @@ static void ChangeDir(int Win, char *Path)
 				GetRemoteDirForWnd(CACHE_NORMAL, &CancelFlg);
 		}
 	}
+	// デッドロック対策
+	EnableUserOpe();
 	return;
 }
 

--- a/remote.c
+++ b/remote.c
@@ -239,9 +239,12 @@ static int DoPWD(char *Buf)
 		if(strlen(Tmp) < FMAX_PATH)
 		{
 			strcpy(Buf, Tmp);
-			ReplaceAll(Buf, '\\', '/');
+			// 0x5Cが含まれる文字列を扱えないバグ修正
+//			ReplaceAll(Buf, '\\', '/');
 			ChangeSepaRemote2Local(Buf);
 			ChangeFnameRemote2Local(Buf, FMAX_PATH);
+			// 0x5Cが含まれる文字列を扱えないバグ修正
+			ReplaceAll(Buf, '\\', '/');
 		}
 		else
 			Sts = FTP_ERROR*100;
@@ -1324,13 +1327,21 @@ int ChangeFnameRemote2Local(char *Fname, int Max)
 	char *Buf;
 	char *Pos;
 	CODECONVINFO cInfo;
+	// バッファ上書きバグ対策
+	char *Buf2;
 
 	Sts = FFFTP_FAIL;
 	if((Buf = malloc(Max)) != NULL)
 	{
+	// バッファ上書きバグ対策
+	if((Buf2 = malloc(strlen(Fname) + 1)) != NULL)
+	{
 		InitCodeConvInfo(&cInfo);
 		cInfo.KanaCnv = NO;			//AskHostNameKana();
-		cInfo.Str = Fname;
+		// バッファ上書きバグ対策
+//		cInfo.Str = Fname;
+		strcpy(Buf2, Fname);
+		cInfo.Str = Buf2;
 		cInfo.StrLen = strlen(Fname);
 		cInfo.Buf = Buf;
 		cInfo.BufSize = Max - 1;
@@ -1432,8 +1443,13 @@ int ChangeFnameRemote2Local(char *Fname, int Max)
 //				strcpy(Pos, Buf);
 //				break;
 		}
-		free(Buf);
+		// バッファ上書きバグ対策
+		free(Buf2);
 		Sts = FFFTP_SUCCESS;
+		}
+		free(Buf);
+		// バッファ上書きバグ対策
+//		Sts = FFFTP_SUCCESS;
 	}
 	return(Sts);
 }
@@ -1456,13 +1472,21 @@ int ChangeFnameLocal2Remote(char *Fname, int Max)
 	char *Buf;
 	char *Pos;
 	CODECONVINFO cInfo;
+	// バッファ上書きバグ対策
+	char *Buf2;
 
 	Sts = FFFTP_FAIL;
 	if((Buf = malloc(Max)) != NULL)
 	{
+	// バッファ上書きバグ対策
+	if((Buf2 = malloc(strlen(Fname) + 1)) != NULL)
+	{
 		InitCodeConvInfo(&cInfo);
 		cInfo.KanaCnv = AskHostNameKana();
-		cInfo.Str = Fname;
+		// バッファ上書きバグ対策
+//		cInfo.Str = Fname;
+		strcpy(Buf2, Fname);
+		cInfo.Str = Buf2;
 		cInfo.StrLen = strlen(Fname);
 		cInfo.Buf = Buf;
 		cInfo.BufSize = Max - 1;
@@ -1587,8 +1611,13 @@ int ChangeFnameLocal2Remote(char *Fname, int Max)
 //				strcpy(Pos, Buf);
 //				break;
 		}
-		free(Buf);
+		// バッファ上書きバグ対策
+		free(Buf2);
 		Sts = FFFTP_SUCCESS;
+		}
+		free(Buf);
+		// バッファ上書きバグ対策
+//		Sts = FFFTP_SUCCESS;
 	}
 	return(Sts);
 }