Commit: 24d1bc42635bcba06b0330864341db64fcf50b13 - ffftp (git)

Loweynet

Commit MetaInfo

• Revisão: 24d1bc42635bcba06b0330864341db64fcf50b13 (tree)
• Hora: 2012-02-15 02:18:04
• Autor: s_kawamoto <s_kawamoto@user...>
• Commiter: s_kawamoto

Mensagem de Log

Add support for automatic directory creation.

Mudança Sumário

• modified: FFFTP_Eng_Release/FFFTP.exe
• modified: Release/FFFTP.exe
• modified: ftpproc.c
• modified: main.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/ftpproc.c
+++ b/ftpproc.c
@@ -108,6 +108,8 @@ extern SIZE MirrorDlgSize;
 extern int VaxSemicolon;
 extern int DebugConsole;
 extern int CancelFlg;
+// ディレクトリ自動作成
+extern int MakeAllDir;
 
 /*===== ローカルなワーク =====*/
 
@@ -136,6 +138,46 @@ static double FileSize;		/* ファイル総容量 */
 *		なし
 *----------------------------------------------------------------------------*/
 
+// ディレクトリ自動作成
+// ローカル側のパスから必要なフォルダを作成
+int MakeDirFromLocalPath(char* LocalFile)
+{
+	TRANSPACKET Pkt;
+	char* pDelimiter;
+	char* pNext;
+	char* Cat;
+	int Len;
+	char Tmp[FMAX_PATH+1];
+	int Make;
+	pDelimiter = LocalFile;
+	Make = NO;
+	while(pNext = strchr(pDelimiter, '\\'))
+	{
+		Len = pNext - LocalFile;
+		strncpy(Pkt.LocalFile, LocalFile, Len);
+		Pkt.LocalFile[Len] = '\0';
+		AskLocalCurDir(Tmp, FMAX_PATH);
+		SetYenTail(Tmp);
+		if(strncmp(LocalFile, Tmp, Len + 1) != 0)
+		{
+			Cat = Pkt.LocalFile + (pDelimiter - LocalFile);
+			if(FnameCnv == FNAME_LOWER)
+				_mbslwr(Cat);
+			else if(FnameCnv == FNAME_UPPER)
+				_mbsupr(Cat);
+			ReplaceAll(Pkt.LocalFile, '/', '\\');
+
+			strcpy(Pkt.Cmd, "MKD ");
+			strcpy(Pkt.RemoteFile, "");
+			AddTransFileList(&Pkt);
+
+			Make = YES;
+		}
+		pDelimiter = pNext + 1;
+	}
+	return Make;
+}
+
 void DownLoadProc(int ChName, int ForceFile, int All)
 {
 	FILELIST *FileListBase;
@@ -248,7 +290,13 @@ void DownLoadProc(int ChName, int ForceFile, int All)
 				if(Pkt.Mode == EXIST_ABORT)
 					break;
 				else if(Pkt.Mode != EXIST_IGNORE)
+				// ディレクトリ自動作成
+//					AddTransFileList(&Pkt);
+				{
+					if(MakeAllDir == YES)
+						MakeDirFromLocalPath(Pkt.LocalFile);
 					AddTransFileList(&Pkt);
+				}
 			}
 			Pos = Pos->Next;
 		}
@@ -890,6 +938,72 @@ static INT_PTR CALLBACK DownExistDialogCallBack(HWND hDlg, UINT iMessage, WPARAM
 *		なし
 *----------------------------------------------------------------------------*/
 
+// ディレクトリ自動作成
+// リモート側のパスから必要なディレクトリを作成
+int MakeDirFromRemotePath(char* RemoteFile, int FirstAdd)
+{
+	TRANSPACKET Pkt;
+	TRANSPACKET Pkt1;
+	char* pDelimiter;
+	char* pNext;
+	char* Cat;
+	int Len;
+	char Tmp[FMAX_PATH+1];
+	int Make;
+	pDelimiter = RemoteFile;
+	Make = NO;
+	while(pNext = strchr(pDelimiter, '/'))
+	{
+		Len = pNext - RemoteFile;
+		strncpy(Pkt.RemoteFile, RemoteFile, Len);
+		Pkt.RemoteFile[Len] = '\0';
+		AskRemoteCurDir(Tmp, FMAX_PATH);
+		SetSlashTail(Tmp);
+		if(strncmp(RemoteFile, Tmp, Len + 1) != 0)
+		{
+			Cat = Pkt.RemoteFile + (pDelimiter - RemoteFile);
+			if(FnameCnv == FNAME_LOWER)
+				_mbslwr(Cat);
+			else if(FnameCnv == FNAME_UPPER)
+				_mbsupr(Cat);
+#if defined(HAVE_TANDEM)
+			Pkt.FileCode = 0;
+			Pkt.PriExt = DEF_PRIEXT;
+			Pkt.SecExt = DEF_SECEXT;
+			Pkt.MaxExt = DEF_MAXEXT;
+#endif
+			ReplaceAll(Pkt.RemoteFile, '\\', '/');
+
+			if(AskHostType() == HTYPE_ACOS)
+			{
+				strcpy(Pkt.RemoteFile, "'");
+				strcat(Pkt.RemoteFile, AskHostLsName());
+				strcat(Pkt.RemoteFile, "(");
+				strcat(Pkt.RemoteFile, Cat);
+				strcat(Pkt.RemoteFile, ")");
+				strcat(Pkt.RemoteFile, "'");
+			}
+			else if(AskHostType() == HTYPE_ACOS_4)
+				strcpy(Pkt.RemoteFile, Cat);
+
+			if((FirstAdd == YES) && (AskNoFullPathMode() == YES))
+			{
+				strcpy(Pkt1.Cmd, "SETCUR");
+				AskRemoteCurDir(Pkt1.RemoteFile, FMAX_PATH);
+				AddTransFileList(&Pkt1);
+			}
+			FirstAdd = NO;
+			strcpy(Pkt.Cmd, "MKD ");
+			strcpy(Pkt.LocalFile, "");
+			AddTransFileList(&Pkt);
+
+			Make = YES;
+		}
+		pDelimiter = pNext + 1;
+	}
+	return Make;
+}
+
 void UpLoadListProc(int ChName, int All)
 {
 	FILELIST *FileListBase;
@@ -961,6 +1075,16 @@ void UpLoadListProc(int ChName, int All)
 				else
 					break;
 			}
+			// バグ修正
+			AskRemoteCurDir(Tmp, FMAX_PATH);
+			SetSlashTail(Tmp);
+			if(strncmp(Pkt.RemoteFile, Tmp, strlen(Tmp)) != 0)
+			{
+				if((Cat = strrchr(Pkt.RemoteFile, '/')) != NULL)
+					Cat++;
+				else
+					Cat = Pkt.RemoteFile;
+			}
 			ReplaceAll(Pkt.RemoteFile, '\\', '/');
 
 			if(AskHostType() == HTYPE_ACOS)
@@ -1034,6 +1158,12 @@ void UpLoadListProc(int ChName, int All)
 					break;
 				else if(Pkt.Mode != EXIST_IGNORE)
 				{
+					// ディレクトリ自動作成
+					if(MakeAllDir == YES)
+					{
+						if(MakeDirFromRemotePath(Pkt.RemoteFile, FirstAdd) == YES)
+							FirstAdd = NO;
+					}
 					if((FirstAdd == YES) && (AskNoFullPathMode() == YES))
 					{
 						strcpy(Pkt1.Cmd, "SETCUR");
@@ -1202,6 +1332,12 @@ void UpLoadDragProc(WPARAM wParam)
 					break;
 				else if(Pkt.Mode != EXIST_IGNORE)
 				{
+					// ディレクトリ自動作成
+					if(MakeAllDir == YES)
+					{
+						if(MakeDirFromRemotePath(Pkt.RemoteFile, FirstAdd) == YES)
+							FirstAdd = NO;
+					}
 					if((FirstAdd == YES) && (AskNoFullPathMode() == YES))
 					{
 						strcpy(Pkt1.Cmd, "SETCUR");

--- a/main.c
+++ b/main.c
@@ -233,6 +233,8 @@ BYTE CertificateCacheHash[MAX_CERT_CACHE_HASH][20];
 BYTE SSLRootCAFileHash[20];
 // ファイルアイコン表示対応
 int DispFileIcon = NO;
+// ディレクトリ自動作成
+int MakeAllDir = YES;