X-Git-Url: http://git.sourceforge.jp/view?p=ffftp%2Fffftp.git;a=blobdiff_plain;f=ftpproc.c;h=94ad8a26ef8554851f08ee0f2f37b6ff3e86c9db;hp=08bcc52933eacfbf13e032d4efe79ac816c7089d;hb=2edde15bf5547440d7089c9cf7fd5098a42126b7;hpb=f93da12f0a0b0271fdaf25d02772972a79d86bf2

diff --git a/ftpproc.c b/ftpproc.c
index 08bcc52..94ad8a2 100644
--- a/ftpproc.c
+++ b/ftpproc.c
@@ -28,6 +28,8 @@
 /============================================================================*/
 
 #define  STRICT
+// IPv6対応
+#include <winsock2.h>
 #include <windows.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -50,24 +52,39 @@
 /*===== プロトタイプ =====*/
 
 static int CheckRemoteFile(TRANSPACKET *Pkt, FILELIST *ListList);
-static BOOL CALLBACK UpExistDialogCallBack(HWND hDlg, UINT iMessage, WPARAM wParam, LPARAM lParam);
+// 64ビット対応
+//static BOOL CALLBACK UpExistDialogCallBack(HWND hDlg, UINT iMessage, WPARAM wParam, LPARAM lParam);
+static INT_PTR CALLBACK UpExistDialogCallBack(HWND hDlg, UINT iMessage, WPARAM wParam, LPARAM lParam);
 
 static void DispMirrorFiles(FILELIST *Local, FILELIST *Remote);
 static void MirrorDeleteAllLocalDir(FILELIST *Local, TRANSPACKET *Pkt, TRANSPACKET **Base);
 static int CheckLocalFile(TRANSPACKET *Pkt);
-static BOOL CALLBACK DownExistDialogCallBack(HWND hDlg, UINT iMessage, WPARAM wParam, LPARAM lParam);
+// 64ビット対応
+//static BOOL CALLBACK DownExistDialogCallBack(HWND hDlg, UINT iMessage, WPARAM wParam, LPARAM lParam);
+static INT_PTR CALLBACK DownExistDialogCallBack(HWND hDlg, UINT iMessage, WPARAM wParam, LPARAM lParam);
 static void RemoveAfterSemicolon(char *Path);
 static void MirrorDeleteAllDir(FILELIST *Remote, TRANSPACKET *Pkt, TRANSPACKET **Base);
-static BOOL CALLBACK MirrorNotifyCallBack(HWND hDlg, UINT iMessage, WPARAM wParam, LPARAM lParam);
-static BOOL CALLBACK MirrorDispListCallBack(HWND hDlg, UINT iMessage, WPARAM wParam, LPARAM lParam);
+// 64ビット対応
+//static BOOL CALLBACK MirrorNotifyCallBack(HWND hDlg, UINT iMessage, WPARAM wParam, LPARAM lParam);
+//static BOOL CALLBACK MirrorDispListCallBack(HWND hDlg, UINT iMessage, WPARAM wParam, LPARAM lParam);
+static INT_PTR CALLBACK MirrorNotifyCallBack(HWND hDlg, UINT iMessage, WPARAM wParam, LPARAM lParam);
+static INT_PTR CALLBACK MirrorDispListCallBack(HWND hDlg, UINT iMessage, WPARAM wParam, LPARAM lParam);
 static void CountMirrorFiles(HWND hDlg, TRANSPACKET *Pkt);
 static int AskMirrorNoTrn(char *Fname, int Mode);
-static int AskUpLoadFileAttr(char *Fname);
-static BOOL CALLBACK UpDownAsDialogCallBack(HWND hDlg, UINT iMessage, WPARAM wParam, LPARAM lParam);
+static int AskUploadFileAttr(char *Fname);
+// 64ビット対応
+//static BOOL CALLBACK UpDownAsDialogCallBack(HWND hDlg, UINT iMessage, WPARAM wParam, LPARAM lParam);
+static INT_PTR CALLBACK UpDownAsDialogCallBack(HWND hDlg, UINT iMessage, WPARAM wParam, LPARAM lParam);
+#if defined(HAVE_TANDEM)
+static INT_PTR CALLBACK UpDownAsWithExtDialogCallBack(HWND hDlg, UINT iMessage, WPARAM wParam, LPARAM lParam);
+#endif
 static void DeleteAllDir(FILELIST *Dt, int Win, int *Sw, int *Flg, char *CurDir);
 static void DelNotifyAndDo(FILELIST *Dt, int Win, int *Sw, int *Flg, char *CurDir);
-static BOOL CALLBACK DeleteDialogCallBack(HWND hDlg, UINT iMessage, WPARAM wParam, LPARAM lParam);
-static BOOL CALLBACK RenameDialogCallBack(HWND hDlg, UINT iMessage, WPARAM wParam, LPARAM lParam);
+// 64ビット対応
+//static BOOL CALLBACK DeleteDialogCallBack(HWND hDlg, UINT iMessage, WPARAM wParam, LPARAM lParam);
+//static BOOL CALLBACK RenameDialogCallBack(HWND hDlg, UINT iMessage, WPARAM wParam, LPARAM lParam);
+static INT_PTR CALLBACK DeleteDialogCallBack(HWND hDlg, UINT iMessage, WPARAM wParam, LPARAM lParam);
+static INT_PTR CALLBACK RenameDialogCallBack(HWND hDlg, UINT iMessage, WPARAM wParam, LPARAM lParam);
 static void SetAttrToDialog(HWND hWnd, int Attr);
 static int GetAttrFromDialog(HWND hDlg);
 static LRESULT CALLBACK SizeNotifyDlgWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam);
@@ -91,10 +108,15 @@ extern SIZE MirrorDlgSize;
 extern int VaxSemicolon;
 extern int DebugConsole;
 extern int CancelFlg;
+// ディレクトリ自動作成
+extern int MakeAllDir;
 
 /*===== ローカルなワーク =====*/
 
 static char TmpString[FMAX_PATH+80];		/* テンポラリ */
+#if defined(HAVE_TANDEM)
+static char TmpFileCode[5];		/* テンポラリ */
+#endif
 static int CurWin;						/* ウインドウ番号 */
 
 int UpExistMode = EXIST_OVW;		/* アップロードで同じ名前のファイルがある時の扱い方 EXIST_xxx */
@@ -116,11 +138,50 @@ static double FileSize;		/* ファイル総容量 */
 *		なし
 *----------------------------------------------------------------------------*/
 
-void DownLoadProc(int ChName, int ForceFile, int All)
+// ディレクトリ自動作成
+// ローカル側のパスから必要なフォルダを作成
+int MakeDirFromLocalPath(char* LocalFile, char* Old)
+{
+	TRANSPACKET Pkt;
+	char* pDelimiter;
+	char* pNext;
+	char* Cat;
+	int Len;
+	int Make;
+	pDelimiter = LocalFile;
+	Make = NO;
+	while(pNext = strchr(pDelimiter, '\\'))
+	{
+		Len = pNext - LocalFile;
+		strncpy(Pkt.LocalFile, LocalFile, Len);
+		Pkt.LocalFile[Len] = '\0';
+		if(strncmp(LocalFile, Old, 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;
 	FILELIST *Pos;
 	TRANSPACKET Pkt;
+	// ディレクトリ自動作成
+	char Tmp[FMAX_PATH+1];
 
 	// 同時接続対応
 	CancelFlg = NO;
@@ -129,9 +190,6 @@ void DownLoadProc(int ChName, int ForceFile, int All)
 	{
 		DisableUserOpe();
 
-		// 同時接続対応
-		SktShareProh();
-
 		ExistNotify = YES;
 //		KeepTransferDialog(YES);
 
@@ -206,6 +264,19 @@ void DownLoadProc(int ChName, int ForceFile, int All)
 				}
 
 				strcpy(Pkt.Cmd, "RETR ");
+#if defined(HAVE_TANDEM)
+				if(AskHostType() == HTYPE_TANDEM) {
+					if(AskTransferType() != TYPE_X) {
+						Pkt.Type = AskTransferType();
+					} else {
+						Pkt.Attr = Pos->Attr;
+						if (Pkt.Attr == 101)
+							Pkt.Type = TYPE_A;
+						else
+							Pkt.Type = TYPE_I;
+					}
+				} else
+#endif
 				Pkt.Type = AskTransferTypeAssoc(Pkt.RemoteFile, AskTransferType());
 				Pkt.Size = Pos->Size;
 				Pkt.Time = Pos->Time;
@@ -214,11 +285,19 @@ void DownLoadProc(int ChName, int ForceFile, int All)
 				Pkt.KanjiCodeDesired = AskLocalKanjiCode();
 				Pkt.KanaCnv = AskHostKanaCnv();
 
+				// ディレクトリ自動作成
+				strcpy(Tmp, Pkt.LocalFile);
 				Pkt.Mode = CheckLocalFile(&Pkt);	/* Pkt.ExistSize がセットされる */
 				if(Pkt.Mode == EXIST_ABORT)
 					break;
 				else if(Pkt.Mode != EXIST_IGNORE)
+				// ディレクトリ自動作成
+//					AddTransFileList(&Pkt);
+				{
+					if(MakeAllDir == YES)
+						MakeDirFromLocalPath(Pkt.LocalFile, Tmp);
 					AddTransFileList(&Pkt);
+				}
 			}
 			Pos = Pos->Next;
 		}
@@ -231,8 +310,12 @@ void DownLoadProc(int ChName, int ForceFile, int All)
 		}
 		DeleteFileList(&FileListBase);
 
-		strcpy(Pkt.Cmd, "GOQUIT");
-		AddTransFileList(&Pkt);
+		// 同時接続対応
+//		strcpy(Pkt.Cmd, "GOQUIT");
+//		AddTransFileList(&Pkt);
+
+		// バグ対策
+		AddNullTransFileList();
 
 		GoForwardTransWindow();
 //		KeepTransferDialog(NO);
@@ -252,9 +335,11 @@ void DownLoadProc(int ChName, int ForceFile, int All)
 *		なし
 *----------------------------------------------------------------------------*/
 
-void DirectDownLoadProc(char *Fname)
+void DirectDownloadProc(char *Fname)
 {
 	TRANSPACKET Pkt;
+	// ディレクトリ自動作成
+	char Tmp[FMAX_PATH+1];
 
 	// 同時接続対応
 	CancelFlg = NO;
@@ -263,9 +348,6 @@ void DirectDownLoadProc(char *Fname)
 	{
 		DisableUserOpe();
 
-		// 同時接続対応
-		SktShareProh();
-
 		ExistNotify = YES;
 //		KeepTransferDialog(YES);
 
@@ -323,9 +405,17 @@ void DirectDownLoadProc(char *Fname)
 				Pkt.KanjiCodeDesired = AskLocalKanjiCode();
 				Pkt.KanaCnv = AskHostKanaCnv();
 
+				// ディレクトリ自動作成
+				strcpy(Tmp, Pkt.LocalFile);
 				Pkt.Mode = CheckLocalFile(&Pkt);	/* Pkt.ExistSize がセットされる */
 				if((Pkt.Mode != EXIST_ABORT) && (Pkt.Mode != EXIST_IGNORE))
+				// ディレクトリ自動作成
+//					AddTransFileList(&Pkt);
+				{
+					if(MakeAllDir == YES)
+						MakeDirFromLocalPath(Pkt.LocalFile, Tmp);
 					AddTransFileList(&Pkt);
+				}
 			}
 		}
 
@@ -336,8 +426,12 @@ void DirectDownLoadProc(char *Fname)
 			AddTransFileList(&Pkt);
 		}
 
-		strcpy(Pkt.Cmd, "GOQUIT");
-		AddTransFileList(&Pkt);
+		// 同時接続対応
+//		strcpy(Pkt.Cmd, "GOQUIT");
+//		AddTransFileList(&Pkt);
+
+		// バグ対策
+		AddNullTransFileList();
 
 		GoForwardTransWindow();
 //		KeepTransferDialog(NO);
@@ -357,7 +451,7 @@ void DirectDownLoadProc(char *Fname)
 *		なし
 *----------------------------------------------------------------------------*/
 
-void InputDownLoadProc(void)
+void InputDownloadProc(void)
 {
 	char Path[FMAX_PATH+1];
 	int Tmp;
@@ -367,7 +461,7 @@ void InputDownLoadProc(void)
 	strcpy(Path, "");
 	if(InputDialogBox(downname_dlg, GetMainHwnd(), NULL, Path, FMAX_PATH, &Tmp, IDH_HELP_TOPIC_0000001) == YES)
 	{
-		DirectDownLoadProc(Path);
+		DirectDownloadProc(Path);
 	}
 
 //	EnableUserOpe();
@@ -405,9 +499,6 @@ void MirrorDownloadProc(int Notify)
 	{
 		DisableUserOpe();
 
-		// 同時接続対応
-		SktShareProh();
-
 		Base = NULL;
 
 		if(Notify == YES)
@@ -605,12 +696,16 @@ void MirrorDownloadProc(int Notify)
 					AddTransFileList(&Pkt);
 				}
 
-				strcpy(Pkt.Cmd, "GOQUIT");
-				AddTransFileList(&Pkt);
+				// 同時接続対応
+//				strcpy(Pkt.Cmd, "GOQUIT");
+//				AddTransFileList(&Pkt);
 			}
 			else
 				EraseTmpTransFileList(&Base);
 
+			// バグ対策
+			AddNullTransFileList();
+
 			DeleteFileList(&LocalListBase);
 			DeleteFileList(&RemoteListBase);
 
@@ -795,7 +890,9 @@ static int CheckLocalFile(TRANSPACKET *Pkt)
 *		BOOL TRUE/FALSE
 *----------------------------------------------------------------------------*/
 
-static BOOL CALLBACK DownExistDialogCallBack(HWND hDlg, UINT iMessage, WPARAM wParam, LPARAM lParam)
+// 64ビット対応
+//static BOOL CALLBACK DownExistDialogCallBack(HWND hDlg, UINT iMessage, WPARAM wParam, LPARAM lParam)
+static INT_PTR CALLBACK DownExistDialogCallBack(HWND hDlg, UINT iMessage, WPARAM wParam, LPARAM lParam)
 {
 	static TRANSPACKET *Pkt;
 	static const RADIOBUTTON DownExistButton[] = {
@@ -861,7 +958,70 @@ static BOOL CALLBACK DownExistDialogCallBack(HWND hDlg, UINT iMessage, WPARAM wP
 *		なし
 *----------------------------------------------------------------------------*/
 
-void UpLoadListProc(int ChName, int All)
+// ディレクトリ自動作成
+// リモート側のパスから必要なディレクトリを作成
+int MakeDirFromRemotePath(char* RemoteFile, char* Old, int FirstAdd)
+{
+	TRANSPACKET Pkt;
+	TRANSPACKET Pkt1;
+	char* pDelimiter;
+	char* pNext;
+	char* Cat;
+	int Len;
+	int Make;
+	pDelimiter = RemoteFile;
+	Make = NO;
+	while(pNext = strchr(pDelimiter, '/'))
+	{
+		Len = pNext - RemoteFile;
+		strncpy(Pkt.RemoteFile, RemoteFile, Len);
+		Pkt.RemoteFile[Len] = '\0';
+		if(strncmp(RemoteFile, Old, 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;
 	FILELIST *Pos;
@@ -879,9 +1039,6 @@ void UpLoadListProc(int ChName, int All)
 	{
 		DisableUserOpe();
 
-		// 同時接続対応
-		SktShareProh();
-
 		// ローカル側で選ばれているファイルをFileListBaseに登録
 		FileListBase = NULL;
 		MakeSelectedFileList(WIN_LOCAL, YES, All, &FileListBase, &CancelFlg);
@@ -907,17 +1064,44 @@ void UpLoadListProc(int ChName, int All)
 					_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
 			}
 			else
 			{
 				// 名前を変更する
 				strcpy(TmpString, Pos->File);
 				CurWin = WIN_LOCAL;
+#if defined(HAVE_TANDEM)
+				strcpy(TmpFileCode, "0"); /* ASCII モードの場合は無視される */
+				if(AskHostType() == HTYPE_TANDEM && AskOSS() == NO) {
+					if(DialogBox(GetFtpInst(), MAKEINTRESOURCE(updown_as_with_ext_dlg), GetMainHwnd(), UpDownAsWithExtDialogCallBack) == YES) {
+						strcat(Pkt.RemoteFile, TmpString);
+						Pkt.FileCode = atoi(TmpFileCode);
+					} else {
+						break;
+					}
+				} else
+#endif
 				if(DialogBox(GetFtpInst(), MAKEINTRESOURCE(updown_as_dlg), GetMainHwnd(), UpDownAsDialogCallBack) == YES)
 					strcat(Pkt.RemoteFile, TmpString);
 				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)
@@ -976,16 +1160,29 @@ void UpLoadListProc(int ChName, int All)
 				Pkt.Type = AskTransferTypeAssoc(Pkt.LocalFile, AskTransferType());
 				Pkt.Size = 0;
 				Pkt.Time = Pos->Time;
-				Pkt.Attr = AskUpLoadFileAttr(Pkt.RemoteFile);
+				Pkt.Attr = AskUploadFileAttr(Pkt.RemoteFile);
 				Pkt.KanjiCode = AskHostKanjiCode();
 				// UTF-8対応
 				Pkt.KanjiCodeDesired = AskLocalKanjiCode();
 				Pkt.KanaCnv = AskHostKanaCnv();
+#if defined(HAVE_TANDEM)
+				if(AskHostType() == HTYPE_TANDEM && AskOSS() == NO) {
+					CalcExtentSize(&Pkt, Pos->Size);
+				}
+#endif
+				// ディレクトリ自動作成
+				strcpy(Tmp, Pkt.RemoteFile);
 				Pkt.Mode = CheckRemoteFile(&Pkt, RemoteList);
 				if(Pkt.Mode == EXIST_ABORT)
 					break;
 				else if(Pkt.Mode != EXIST_IGNORE)
 				{
+					// ディレクトリ自動作成
+					if(MakeAllDir == YES)
+					{
+						if(MakeDirFromRemotePath(Pkt.RemoteFile, Tmp, FirstAdd) == YES)
+							FirstAdd = NO;
+					}
 					if((FirstAdd == YES) && (AskNoFullPathMode() == YES))
 					{
 						strcpy(Pkt1.Cmd, "SETCUR");
@@ -1011,8 +1208,12 @@ void UpLoadListProc(int ChName, int All)
 
 		DeleteFileList(&FileListBase);
 
-		strcpy(Pkt.Cmd, "GOQUIT");
-		AddTransFileList(&Pkt);
+		// 同時接続対応
+//		strcpy(Pkt.Cmd, "GOQUIT");
+//		AddTransFileList(&Pkt);
+
+		// バグ対策
+		AddNullTransFileList();
 
 		GoForwardTransWindow();
 
@@ -1031,7 +1232,7 @@ void UpLoadListProc(int ChName, int All)
 *		なし
 *----------------------------------------------------------------------------*/
 
-void UpLoadDragProc(WPARAM wParam)
+void UploadDragProc(WPARAM wParam)
 {
 	FILELIST *FileListBase;
 	FILELIST *Pos;
@@ -1050,9 +1251,6 @@ void UpLoadDragProc(WPARAM wParam)
 	{
 		DisableUserOpe();
 
-		// 同時接続対応
-		SktShareProh();
-
 		// ローカル側で選ばれているファイルをFileListBaseに登録
 		FileListBase = NULL;
 		MakeDroppedFileList(wParam, Cur, &FileListBase);
@@ -1078,6 +1276,12 @@ void UpLoadDragProc(WPARAM wParam)
 			else if(FnameCnv == FNAME_UPPER)
 				_mbsupr(Cat);
 			ReplaceAll(Pkt.RemoteFile, '\\', '/');
+#if defined(HAVE_TANDEM)
+			Pkt.FileCode = 0;
+			Pkt.PriExt = DEF_PRIEXT;
+			Pkt.SecExt = DEF_SECEXT;
+			Pkt.MaxExt = DEF_MAXEXT;
+#endif
 
 			if(AskHostType() == HTYPE_ACOS)
 			{
@@ -1134,16 +1338,30 @@ void UpLoadDragProc(WPARAM wParam)
 				Pkt.Type = AskTransferTypeAssoc(Pkt.LocalFile, AskTransferType());
 				Pkt.Size = 0;
 				Pkt.Time = Pos->Time;
-				Pkt.Attr = AskUpLoadFileAttr(Pkt.RemoteFile);
+				Pkt.Attr = AskUploadFileAttr(Pkt.RemoteFile);
 				Pkt.KanjiCode = AskHostKanjiCode();
 				// UTF-8対応
 				Pkt.KanjiCodeDesired = AskLocalKanjiCode();
 				Pkt.KanaCnv = AskHostKanaCnv();
+#if defined(HAVE_TANDEM)
+				if(AskHostType() == HTYPE_TANDEM && AskOSS() == NO) {
+					int a = Pos->InfoExist && FINFO_SIZE;
+					CalcExtentSize(&Pkt, Pos->Size);
+				}
+#endif
+				// ディレクトリ自動作成
+				strcpy(Tmp, Pkt.RemoteFile);
 				Pkt.Mode = CheckRemoteFile(&Pkt, RemoteList);
 				if(Pkt.Mode == EXIST_ABORT)
 					break;
 				else if(Pkt.Mode != EXIST_IGNORE)
 				{
+					// ディレクトリ自動作成
+					if(MakeAllDir == YES)
+					{
+						if(MakeDirFromRemotePath(Pkt.RemoteFile, Tmp, FirstAdd) == YES)
+							FirstAdd = NO;
+					}
 					if((FirstAdd == YES) && (AskNoFullPathMode() == YES))
 					{
 						strcpy(Pkt1.Cmd, "SETCUR");
@@ -1169,8 +1387,12 @@ void UpLoadDragProc(WPARAM wParam)
 
 		DeleteFileList(&FileListBase);
 
-		strcpy(Pkt.Cmd, "GOQUIT");
-		AddTransFileList(&Pkt);
+		// 同時接続対応
+//		strcpy(Pkt.Cmd, "GOQUIT");
+//		AddTransFileList(&Pkt);
+
+		// バグ対策
+		AddNullTransFileList();
 
 		GoForwardTransWindow();
 
@@ -1212,9 +1434,6 @@ void MirrorUploadProc(int Notify)
 	{
 		DisableUserOpe();
 
-		// 同時接続対応
-		SktShareProh();
-
 		Base = NULL;
 
 		if(Notify == YES)
@@ -1408,11 +1627,16 @@ void MirrorUploadProc(int Notify)
 						Pkt.Type = AskTransferTypeAssoc(Pkt.LocalFile, AskTransferType());
 						Pkt.Size = 0;
 						Pkt.Time = LocalPos->Time;
-						Pkt.Attr = AskUpLoadFileAttr(Pkt.RemoteFile);
+						Pkt.Attr = AskUploadFileAttr(Pkt.RemoteFile);
 						Pkt.KanjiCode = AskHostKanjiCode();
 						// UTF-8対応
 						Pkt.KanjiCodeDesired = AskLocalKanjiCode();
 						Pkt.KanaCnv = AskHostKanaCnv();
+#if defined(HAVE_TANDEM)
+						if(AskHostType() == HTYPE_TANDEM && AskOSS() == NO) {
+							CalcExtentSize(&Pkt, LocalPos->Size);
+						}
+#endif
 						Pkt.Mode = EXIST_OVW;
 						AddTmpTransFileList(&Pkt, &Base);
 					}
@@ -1438,12 +1662,16 @@ void MirrorUploadProc(int Notify)
 					AddTransFileList(&Pkt);
 				}
 
-				strcpy(Pkt.Cmd, "GOQUIT");
-				AddTransFileList(&Pkt);
+				// 同時接続対応
+//				strcpy(Pkt.Cmd, "GOQUIT");
+//				AddTransFileList(&Pkt);
 			}
 			else
 				EraseTmpTransFileList(&Base);
 
+			// バグ対策
+			AddNullTransFileList();
+
 			DeleteFileList(&LocalListBase);
 			DeleteFileList(&RemoteListBase);
 
@@ -1505,7 +1733,9 @@ static void MirrorDeleteAllDir(FILELIST *Remote, TRANSPACKET *Pkt, TRANSPACKET *
 *		BOOL TRUE/FALSE
 *----------------------------------------------------------------------------*/
 
-static BOOL CALLBACK MirrorNotifyCallBack(HWND hDlg, UINT iMessage, WPARAM wParam, LPARAM lParam)
+// 64ビット対応
+//static BOOL CALLBACK MirrorNotifyCallBack(HWND hDlg, UINT iMessage, WPARAM wParam, LPARAM lParam)
+static INT_PTR CALLBACK MirrorNotifyCallBack(HWND hDlg, UINT iMessage, WPARAM wParam, LPARAM lParam)
 {
 	static int Mode;
 
@@ -1554,7 +1784,9 @@ static BOOL CALLBACK MirrorNotifyCallBack(HWND hDlg, UINT iMessage, WPARAM wPara
 *		BOOL TRUE/FALSE
 *----------------------------------------------------------------------------*/
 
-static BOOL CALLBACK MirrorDispListCallBack(HWND hDlg, UINT iMessage, WPARAM wParam, LPARAM lParam)
+// 64ビット対応
+//static BOOL CALLBACK MirrorDispListCallBack(HWND hDlg, UINT iMessage, WPARAM wParam, LPARAM lParam)
+static INT_PTR CALLBACK MirrorDispListCallBack(HWND hDlg, UINT iMessage, WPARAM wParam, LPARAM lParam)
 {
 	static DIALOGSIZE DlgSize = {
 		{ MIRROR_DEL, MIRROR_SIZEGRIP, -1 },
@@ -1771,7 +2003,7 @@ static int AskMirrorNoTrn(char *Fname, int Mode)
 *		int 属性 (-1=設定なし)
 *----------------------------------------------------------------------------*/
 
-static int AskUpLoadFileAttr(char *Fname)
+static int AskUploadFileAttr(char *Fname)
 {
 	int Ret;
 	int Sts;
@@ -1813,13 +2045,26 @@ static int AskUpLoadFileAttr(char *Fname)
 static int CheckRemoteFile(TRANSPACKET *Pkt, FILELIST *ListList)
 {
 	int Ret;
+#if defined(HAVE_TANDEM)
+	int Mode;
+#endif
 	FILELIST *Exist;
 
 	Ret = EXIST_OVW;
 	Pkt->ExistSize = 0;
 	if(SendMode != TRANS_OVW)
 	{
+#if defined(HAVE_TANDEM)
+		/* HP NonStop Server は大文字小文字の区別なし(すべて大文字) */
+		if(AskHostType() == HTYPE_TANDEM)
+			Mode = COMP_IGNORE;
+		else
+			Mode = COMP_STRICT;
+
+		if((Exist = SearchFileList(GetFileName(Pkt->RemoteFile), ListList, Mode)) != NULL)
+#else
 		if((Exist = SearchFileList(GetFileName(Pkt->RemoteFile), ListList, COMP_STRICT)) != NULL)
+#endif
 		{
 			Pkt->ExistSize = Exist->Size;
 
@@ -1860,7 +2105,9 @@ static int CheckRemoteFile(TRANSPACKET *Pkt, FILELIST *ListList)
 *		BOOL TRUE/FALSE
 *----------------------------------------------------------------------------*/
 
-static BOOL CALLBACK UpExistDialogCallBack(HWND hDlg, UINT iMessage, WPARAM wParam, LPARAM lParam)
+// 64ビット対応
+//static BOOL CALLBACK UpExistDialogCallBack(HWND hDlg, UINT iMessage, WPARAM wParam, LPARAM lParam)
+static INT_PTR CALLBACK UpExistDialogCallBack(HWND hDlg, UINT iMessage, WPARAM wParam, LPARAM lParam)
 {
 	static TRANSPACKET *Pkt;
 	static const RADIOBUTTON UpExistButton[] = {
@@ -1926,7 +2173,55 @@ static BOOL CALLBACK UpExistDialogCallBack(HWND hDlg, UINT iMessage, WPARAM wPar
 *		BOOL TRUE/FALSE
 *----------------------------------------------------------------------------*/
 
-static BOOL CALLBACK UpDownAsDialogCallBack(HWND hDlg, UINT iMessage, WPARAM wParam, LPARAM lParam)
+// 64ビット対応
+//static BOOL CALLBACK UpDownAsDialogCallBack(HWND hDlg, UINT iMessage, WPARAM wParam, LPARAM lParam)
+static INT_PTR CALLBACK UpDownAsDialogCallBack(HWND hDlg, UINT iMessage, WPARAM wParam, LPARAM lParam)
+{
+	switch (iMessage)
+	{
+		case WM_INITDIALOG :
+			if(CurWin == WIN_LOCAL)
+				SendMessage(hDlg, WM_SETTEXT, 0, (LPARAM)MSGJPN064);
+			else
+				SendMessage(hDlg, WM_SETTEXT, 0, (LPARAM)MSGJPN065);
+
+			SendDlgItemMessage(hDlg, UPDOWNAS_NEW, EM_LIMITTEXT, FMAX_PATH, 0);
+			SendDlgItemMessage(hDlg, UPDOWNAS_NEW, WM_SETTEXT, 0, (LPARAM)TmpString);
+			SendDlgItemMessage(hDlg, UPDOWNAS_TEXT, WM_SETTEXT, 0, (LPARAM)TmpString);
+			return(TRUE);
+
+		case WM_COMMAND :
+			switch(GET_WM_COMMAND_ID(wParam, lParam))
+			{
+				case IDOK :
+					SendDlgItemMessage(hDlg, UPDOWNAS_NEW, WM_GETTEXT, FMAX_PATH, (LPARAM)TmpString);
+					EndDialog(hDlg, YES);
+					break;
+
+				case UPDOWNAS_STOP :
+					EndDialog(hDlg, NO_ALL);
+					break;
+			}
+            return(TRUE);
+	}
+	return(FALSE);
+}
+
+
+#if defined(HAVE_TANDEM)
+/*----- アップロード／ダウンロードファイル名入力ダイアログのコールバック ------
+*
+*	Parameter
+*		HWND hDlg : ウインドウハンドル
+*		UINT message : メッセージ番号
+*		WPARAM wParam : メッセージの WPARAM 引数
+*		LPARAM lParam : メッセージの LPARAM 引数
+*
+*	Return Value
+*		BOOL TRUE/FALSE
+*----------------------------------------------------------------------------*/
+
+static INT_PTR CALLBACK UpDownAsWithExtDialogCallBack(HWND hDlg, UINT iMessage, WPARAM wParam, LPARAM lParam)
 {
 	switch (iMessage)
 	{
@@ -1939,6 +2234,9 @@ static BOOL CALLBACK UpDownAsDialogCallBack(HWND hDlg, UINT iMessage, WPARAM wPa
 			SendDlgItemMessage(hDlg, UPDOWNAS_NEW, EM_LIMITTEXT, FMAX_PATH, 0);
 			SendDlgItemMessage(hDlg, UPDOWNAS_NEW, WM_SETTEXT, 0, (LPARAM)TmpString);
 			SendDlgItemMessage(hDlg, UPDOWNAS_TEXT, WM_SETTEXT, 0, (LPARAM)TmpString);
+			SendDlgItemMessage(hDlg, UPDOWNAS_FILECODE, EM_LIMITTEXT, 4, 0);
+			SendDlgItemMessage(hDlg, UPDOWNAS_FILECODE, WM_SETTEXT, 0, (LPARAM)TmpFileCode);
+
 			return(TRUE);
 
 		case WM_COMMAND :
@@ -1946,6 +2244,7 @@ static BOOL CALLBACK UpDownAsDialogCallBack(HWND hDlg, UINT iMessage, WPARAM wPa
 			{
 				case IDOK :
 					SendDlgItemMessage(hDlg, UPDOWNAS_NEW, WM_GETTEXT, FMAX_PATH, (LPARAM)TmpString);
+					SendDlgItemMessage(hDlg, UPDOWNAS_FILECODE, WM_GETTEXT, FMAX_PATH, (LPARAM)TmpFileCode);
 					EndDialog(hDlg, YES);
 					break;
 
@@ -1957,6 +2256,7 @@ static BOOL CALLBACK UpDownAsDialogCallBack(HWND hDlg, UINT iMessage, WPARAM wPa
 	}
 	return(FALSE);
 }
+#endif
 
 
 /*----- ファイル一覧で指定されたファイルを削除する ----------------------------
@@ -2116,7 +2416,9 @@ static void DelNotifyAndDo(FILELIST *Dt, int Win, int *Sw, int *Flg, char *CurDi
 	{
 		sprintf(TmpString, "%s", Path);
 
-		if(AskHostType() == HTYPE_VMS)
+		// ローカルのファイルのパスの最後の'\\'が消えるバグ修正
+//		if(AskHostType() == HTYPE_VMS)
+		if(Win == WIN_REMOTE && AskHostType() == HTYPE_VMS)
 			ReformToVMSstylePathName(TmpString);
 
 		CurWin = Win;
@@ -2167,7 +2469,9 @@ static void DelNotifyAndDo(FILELIST *Dt, int Win, int *Sw, int *Flg, char *CurDi
 *		BOOL TRUE/FALSE
 *----------------------------------------------------------------------------*/
 
-static BOOL CALLBACK DeleteDialogCallBack(HWND hDlg, UINT iMessage, WPARAM wParam, LPARAM lParam)
+// 64ビット対応
+//static BOOL CALLBACK DeleteDialogCallBack(HWND hDlg, UINT iMessage, WPARAM wParam, LPARAM lParam)
+static INT_PTR CALLBACK DeleteDialogCallBack(HWND hDlg, UINT iMessage, WPARAM wParam, LPARAM lParam)
 {
 	switch (iMessage)
 	{
@@ -2419,7 +2723,9 @@ void MoveRemoteFileProc(int drop_index)
 *		BOOL TRUE/FALSE
 *----------------------------------------------------------------------------*/
 
-static BOOL CALLBACK RenameDialogCallBack(HWND hDlg, UINT iMessage, WPARAM wParam, LPARAM lParam)
+// 64ビット対応
+//static BOOL CALLBACK RenameDialogCallBack(HWND hDlg, UINT iMessage, WPARAM wParam, LPARAM lParam)
+static INT_PTR CALLBACK RenameDialogCallBack(HWND hDlg, UINT iMessage, WPARAM wParam, LPARAM lParam)
 {
 	switch (iMessage)
 	{
@@ -2773,7 +3079,9 @@ void ChmodProc(void)
 *		BOOL TRUE/FALSE
 *----------------------------------------------------------------------------*/
 
-BOOL CALLBACK ChmodDialogCallBack(HWND hDlg, UINT iMessage, WPARAM wParam, LPARAM lParam)
+// 64ビット対応
+//BOOL CALLBACK ChmodDialogCallBack(HWND hDlg, UINT iMessage, WPARAM wParam, LPARAM lParam)
+INT_PTR CALLBACK ChmodDialogCallBack(HWND hDlg, UINT iMessage, WPARAM wParam, LPARAM lParam)
 {
 	char Str[5];
 	static char *Buf;
@@ -2937,7 +3245,9 @@ void SomeCmdProc(void)
 
 			if(InputDialogBox(somecmd_dlg, GetMainHwnd(), NULL, Cmd, 81, &Tmp, IDH_HELP_TOPIC_0000023) == YES)
 			{
-				DoQUOTE(Cmd);
+				// 同時接続対応
+				//DoQUOTE(Cmd);
+				DoQUOTE(AskCmdCtrlSkt(), Cmd, &CancelFlg);
 			}
 			EnableUserOpe();
 		}
@@ -3375,3 +3685,20 @@ static int RenameUnuseableName(char *Fname)
 }
 
 
+// 自動切断対策
+// NOOPコマンドでは効果が無いホストが多いためLISTコマンドを使用
+void NoopProc(void)
+{
+	int CancelCheckWork;
+	CancelCheckWork = NO;
+	if(AskConnecting() == YES && AskUserOpeDisabled() == NO)
+	{
+		if(AskReuseCmdSkt() == NO || AskShareProh() == YES || AskTransferNow() == NO)
+		{
+			DisableUserOpe();
+			DoDirListCmdSkt("", "", 999, &CancelCheckWork);
+			EnableUserOpe();
+		}
+	}
+}
+