Commit: 08cb92f946f548cab1ed9738b6bdda9e65247935 - ffftp (git)

FFFTPのソースコードです。

Commit MetaInfo

• Revisão: 08cb92f946f548cab1ed9738b6bdda9e65247935 (tree)
• Hora: 2011-12-04 01:21:09
• Autor: s_kawamoto <s_kawamoto@user...>
• Commiter: s_kawamoto

Mensagem de Log

Fix bugs of UTF-8 to UTF-16 API bridge.
Change the temporary directory.

Mudança Sumário

• modified: FFFTP_Eng_Release/FFFTP.exe
• modified: Release/FFFTP.exe
• modified: common.h
• modified: filelist.c
• modified: main.c
• modified: mbswrapper.c
• modified: mbswrapper.h
• modified: misc.c
• modified: option.c
• modified: registry.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/common.h
+++ b/common.h
@@ -1730,6 +1730,8 @@ LONGLONG MakeLongLong(DWORD High, DWORD Low);
 char *MakeNumString(LONGLONG Num, char *Buf, BOOL Comma);
 // 異なるファイルが表示されるバグ修正
 char* MakeDistinguishableFileName(char* Out, char* In);
+// 環境依存の不具合対策
+char* GetAppTempPath(char* Buf);
 
 /*===== dlgsize.c =====*/
 

--- a/filelist.c
+++ b/filelist.c
@@ -462,10 +462,15 @@ static void doTransferRemoteFile(void)
 
 	// アプリを多重起動してもコンフリクトしないように、テンポラリフォルダ名にプロセスID
 	// を付加する。(2007.9.13 yutaka)
-	GetTempPath(sizeof(TmpDir), TmpDir);
-	pid = GetCurrentProcessId();
-	_snprintf_s(buf, sizeof(buf), _TRUNCATE, "ffftp%d", pid);
-	strncat_s(TmpDir, sizeof(TmpDir), buf, _TRUNCATE);
+	// 環境依存の不具合対策
+//	GetTempPath(sizeof(TmpDir), TmpDir);
+//	pid = GetCurrentProcessId();
+//	_snprintf_s(buf, sizeof(buf), _TRUNCATE, "ffftp%d", pid);
+//	strncat_s(TmpDir, sizeof(TmpDir), buf, _TRUNCATE);
+	GetAppTempPath(TmpDir);
+	_mkdir(TmpDir);
+	SetYenTail(TmpDir);
+	strcat(TmpDir, "transfer");
 	_mkdir(TmpDir);
 #if 0
 	if (TmpDir[strlen(TmpDir) - 1] == '\\') {

--- a/main.c
+++ b/main.c
@@ -415,7 +415,11 @@ static int InitApp(LPSTR lpszCmdLine, int cmdShow)
 	{
 		Accel = LoadAccelerators(hInstFtp, MAKEINTRESOURCE(ffftp_accel));
 
-		GetTempPath(FMAX_PATH, TmpPath);
+		// 環境依存の不具合対策
+//		GetTempPath(FMAX_PATH, TmpPath);
+		GetAppTempPath(TmpPath);
+		_mkdir(TmpPath);
+		SetYenTail(TmpPath);
 
 		GetModuleFileName(NULL, HelpPath, FMAX_PATH);
 		strcpy(GetFileName(HelpPath), "ffftp.chm");
@@ -2019,6 +2023,9 @@ static char *GetToken(char *Str, char *Buf)
 
 static void ExitProc(HWND hWnd)
 {
+	// 環境依存の不具合対策
+	char Tmp[FMAX_PATH+1];
+
 	CancelFlg = YES;
 
 	CloseTransferThread();
@@ -2047,6 +2054,10 @@ static void ExitProc(HWND hWnd)
 	else
 		DeleteCache();
 
+	// 環境依存の不具合対策
+	GetAppTempPath(Tmp);
+	_rmdir(Tmp);
+
 	if(RasClose == YES)
 	{
 		DisconnectRas(RasCloseNotify);

--- a/mbswrapper.c
+++ b/mbswrapper.c
@@ -2109,7 +2109,7 @@ END_ROUTINE
 
 int mkdirM(const char * _Path)
 {
-	int r = 0;
+	int r = -1;
 	wchar_t* pw0 = NULL;
 START_ROUTINE
 	pw0 = DuplicateMtoW(_Path, -1);
@@ -2121,7 +2121,7 @@ END_ROUTINE
 
 int _mkdirM(const char * _Path)
 {
-	int r = 0;
+	int r = -1;
 	wchar_t* pw0 = NULL;
 START_ROUTINE
 	pw0 = DuplicateMtoW(_Path, -1);
@@ -2133,7 +2133,7 @@ END_ROUTINE
 
 int rmdirM(const char * _Path)
 {
-	int r = 0;
+	int r = -1;
 	wchar_t* pw0 = NULL;
 START_ROUTINE
 	pw0 = DuplicateMtoW(_Path, -1);
@@ -2145,7 +2145,7 @@ END_ROUTINE
 
 int _rmdirM(const char * _Path)
 {
-	int r = 0;
+	int r = -1;
 	wchar_t* pw0 = NULL;
 START_ROUTINE
 	pw0 = DuplicateMtoW(_Path, -1);
@@ -2155,6 +2155,42 @@ END_ROUTINE
 	return r;
 }
 
+int removeM(const char * _Filename)
+{
+	int r = -1;
+	wchar_t* pw0 = NULL;
+START_ROUTINE
+	pw0 = DuplicateMtoW(_Filename, -1);
+	r = _wremove(pw0);
+END_ROUTINE
+	FreeDuplicatedString(pw0);
+	return r;
+}
+
+int _removeM(const char * _Filename)
+{
+	int r = -1;
+	wchar_t* pw0 = NULL;
+START_ROUTINE
+	pw0 = DuplicateMtoW(_Filename, -1);
+	r = _wremove(pw0);
+END_ROUTINE
+	FreeDuplicatedString(pw0);
+	return r;
+}
+
+int _unlinkM(const char * _Filename)
+{
+	int r = -1;
+	wchar_t* pw0 = NULL;
+START_ROUTINE
+	pw0 = DuplicateMtoW(_Filename, -1);
+	r = _wunlink(pw0);
+END_ROUTINE
+	FreeDuplicatedString(pw0);
+	return r;
+}
+
 size_t _mbslenM(const unsigned char * _Str)
 {
 	size_t r = 0;

--- a/mbswrapper.h
+++ b/mbswrapper.h
@@ -182,6 +182,15 @@ int rmdirM(const char * _Path);
 #undef _rmdir
 #define _rmdir _rmdirM
 int _rmdirM(const char * _Path);
+#undef remove
+#define remove removeM
+int removeM(const char * _Filename);
+#undef _remove
+#define _remove _removeM
+int _removeM(const char * _Filename);
+#undef _unlink
+#define _unlink _unlinkM
+int _unlinkM(const char * _Filename);
 #undef _mbslen
 #define _mbslen _mbslenM
 size_t _mbslenM(const unsigned char * _Str);

--- a/misc.c
+++ b/misc.c
@@ -1777,3 +1777,14 @@ char* MakeDistinguishableFileName(char* Out, char* In)
 	return Out;
 }
 
+// 環境依存の不具合対策
+char* GetAppTempPath(char* Buf)
+{
+	char Temp[32];
+	GetTempPath(MAX_PATH, Buf);
+	SetYenTail(Buf);
+	sprintf(Temp, "ffftp%08x", GetCurrentProcessId());
+	strcat(Buf, Temp);
+	return Buf;
+}
+

--- a/option.c
+++ b/option.c
@@ -1537,7 +1537,10 @@ static INT_PTR CALLBACK MiscSettingProc(HWND hDlg, UINT message, WPARAM wParam,
 					break;
 
 				case MISC_CACHEDIR_DEF :
-					GetTempPath(FMAX_PATH, Tmp);
+					// 環境依存の不具合対策
+//					GetTempPath(FMAX_PATH, Tmp);
+					GetAppTempPath(Tmp);
+					SetYenTail(Tmp);
 					SendDlgItemMessage(hDlg, MISC_CACHEDIR, WM_SETTEXT, 0, (LPARAM)Tmp);
 					break;
 			}

--- a/registry.c
+++ b/registry.c
@@ -422,7 +422,10 @@ void SaveRegistory(void)
 
 				WriteMultiStringToReg(hKey4, "DefAttr", DefAttrList);
 
-				GetTempPath(FMAX_PATH, Str);
+				// 環境依存の不具合対策
+//				GetTempPath(FMAX_PATH, Str);
+				GetAppTempPath(Str);
+				SetYenTail(Str);
 				SaveStr(hKey4, "Tmp", TmpPath, Str);
 
 				WriteBinaryToReg(hKey4, "Hdlg", &HostDlgSize, sizeof(SIZE));