X-Git-Url: http://git.sourceforge.jp/view?a=blobdiff_plain;f=getput.c;h=fb0e1f62e12b4fa6675385a677a69e4573eb8dad;hb=0ae23bd18c4f4de6781bec3a83021fddddae7480;hp=28c2471de5eb3666ea6fab767deb4c5f076ad984;hpb=bcc0424d0bfdc429e383051700365714c5c09618;p=ffftp%2Fffftp.git

diff --git a/getput.c b/getput.c
index 28c2471..fb0e1f6 100644
--- a/getput.c
+++ b/getput.c
@@ -84,9 +84,9 @@ static void DispTransPacket(TRANSPACKET *Pkt);
 static void EraseTransFileList(void);
 static ULONG WINAPI TransferThread(void *Dummy);
 static int MakeNonFullPath(TRANSPACKET *Pkt, char *CurDir, char *Tmp);
-static int DownLoadNonPassive(TRANSPACKET *Pkt, int *CancelCheckWork);
-static int DownLoadPassive(TRANSPACKET *Pkt, int *CancelCheckWork);
-static int DownLoadFile(TRANSPACKET *Pkt, SOCKET dSkt, int CreateMode, int *CancelCheckWork);
+static int DownloadNonPassive(TRANSPACKET *Pkt, int *CancelCheckWork);
+static int DownloadPassive(TRANSPACKET *Pkt, int *CancelCheckWork);
+static int DownloadFile(TRANSPACKET *Pkt, SOCKET dSkt, int CreateMode, int *CancelCheckWork);
 static void DispDownloadFinishMsg(TRANSPACKET *Pkt, int iRetCode);
 // 再転送対応
 //static int DispUpDownErrDialog(int ResID, HWND hWnd, char *Fname);
@@ -98,10 +98,10 @@ static int SetDownloadResume(TRANSPACKET *Pkt, int ProcMode, LONGLONG Size, int
 // 64ビット対応
 //static BOOL CALLBACK NoResumeWndProc(HWND hDlg, UINT iMessage, WPARAM wParam, LPARAM lParam);
 static INT_PTR CALLBACK NoResumeWndProc(HWND hDlg, UINT iMessage, WPARAM wParam, LPARAM lParam);
-static int DoUpLoad(SOCKET cSkt, TRANSPACKET *Pkt);
-static int UpLoadNonPassive(TRANSPACKET *Pkt);
-static int UpLoadPassive(TRANSPACKET *Pkt);
-static int UpLoadFile(TRANSPACKET *Pkt, SOCKET dSkt);
+static int DoUpload(SOCKET cSkt, TRANSPACKET *Pkt);
+static int UploadNonPassive(TRANSPACKET *Pkt);
+static int UploadPassive(TRANSPACKET *Pkt);
+static int UploadFile(TRANSPACKET *Pkt, SOCKET dSkt);
 // 同時接続対応
 //static int TermCodeConvAndSend(TERMCODECONVINFO *tInfo, SOCKET Skt, char *Data, int Size, int Ascii);
 static int TermCodeConvAndSend(TERMCODECONVINFO *tInfo, SOCKET Skt, char *Data, int Size, int Ascii, int *CancelCheckWork);
@@ -182,6 +182,8 @@ extern int MirUpDelNotify;
 extern int MirDownDelNotify;
 extern int FolderAttr;
 extern int FolderAttrNum;
+// 同時接続対応
+extern int SendQuit;
 
 
 /*----- ファイル転送スレッドを起動する ----------------------------------------
@@ -434,6 +436,15 @@ void AddTransFileList(TRANSPACKET *Pkt)
 }
 
 
+// バグ対策
+void AddNullTransFileList()
+{
+	TRANSPACKET Pkt;
+	memset(&Pkt, 0, sizeof(TRANSPACKET));
+	strcpy(Pkt.Cmd, "NULL");
+	AddTransFileList(&Pkt);
+}
+
 /*----- 転送ファイル情報を転送ファイルリストに追加する ------------------------
 *
 *	Parameter
@@ -537,7 +548,7 @@ static void EraseTransFileList(void)
 	TRANSPACKET *New;
 	TRANSPACKET *Next;
 	TRANSPACKET *NotDel;
-	TRANSPACKET Pkt;
+//	TRANSPACKET Pkt;
 
 	NotDel = NULL;
 
@@ -582,8 +593,9 @@ static void EraseTransFileList(void)
 	// 同時接続対応
 	WaitForMainThread = NO;
 
-	strcpy(Pkt.Cmd, "GOQUIT");
-	AddTransFileList(&Pkt);
+	// 同時接続対応
+//	strcpy(Pkt.Cmd, "GOQUIT");
+//	AddTransFileList(&Pkt);
 	return;
 }
 
@@ -742,6 +754,8 @@ static ULONG WINAPI TransferThread(void *Dummy)
 			Pos = TransPacketBase;
 			TransPacketBase = TransPacketBase->Next;
 			free(Pos);
+			if(TransPacketBase == NULL)
+				GoExit = YES;
 		}
 		NewCmdSkt = AskCmdCtrlSkt();
 		if(AskReuseCmdSkt() == YES && ThreadCount == 0)
@@ -753,43 +767,42 @@ static ULONG WINAPI TransferThread(void *Dummy)
 		{
 			if(TransPacketBase && NewCmdSkt != INVALID_SOCKET && ThreadCount < AskMaxThreadCount())
 			{
+				ReleaseMutex(hListAccMutex);
 				if(TrnSkt == INVALID_SOCKET || NewCmdSkt != CmdSkt)
-				{
-					ReleaseMutex(hListAccMutex);
 					ReConnectTrnSkt(&TrnSkt, &Canceled[ThreadCount]);
-					// 同時ログイン数制限対策
-					if(TrnSkt != INVALID_SOCKET)
-						LastUsed = timeGetTime();
-					else
-					{
-						// 同時ログイン数制限に引っかかった可能性あり
-						// 負荷を下げるために約10秒間待機
-						i = 10000;
-						while(NewCmdSkt != CmdSkt && i > 0)
-						{
-							BackgrndMessageProc();
-							Sleep(1);
-							i--;
-						}
-					}
-//					WaitForSingleObject(hListAccMutex, INFINITE);
-					while(WaitForSingleObject(hListAccMutex, 0) == WAIT_TIMEOUT)
+				else
+					CheckClosedAndReconnectTrnSkt(&TrnSkt, &Canceled[ThreadCount]);
+				// 同時ログイン数制限対策
+				if(TrnSkt == INVALID_SOCKET)
+				{
+					// 同時ログイン数制限に引っかかった可能性あり
+					// 負荷を下げるために約10秒間待機
+					i = 10000;
+					while(NewCmdSkt != CmdSkt && i > 0)
 					{
 						BackgrndMessageProc();
 						Sleep(1);
+						i--;
 					}
 				}
+				LastUsed = timeGetTime();
+//				WaitForSingleObject(hListAccMutex, INFINITE);
+				while(WaitForSingleObject(hListAccMutex, 0) == WAIT_TIMEOUT)
+				{
+					BackgrndMessageProc();
+					Sleep(1);
+				}
 			}
 			else
 			{
 				if(TrnSkt != INVALID_SOCKET)
 				{
 					// 同時ログイン数制限対策
-					// 10秒間は再利用を許可
-					if(timeGetTime() - LastUsed > 10000)
+					// 60秒間使用されなければログアウト
+					if(timeGetTime() - LastUsed > 60000 || NewCmdSkt == INVALID_SOCKET)
 					{
 						ReleaseMutex(hListAccMutex);
-						SendData(TrnSkt, "QUIT\r\n", 6, 0, &Canceled[ThreadCount]);
+						DoQUIT(TrnSkt, &Canceled[ThreadCount]);
 						DoClose(TrnSkt);
 						TrnSkt = INVALID_SOCKET;
 //						WaitForSingleObject(hListAccMutex, INFINITE);
@@ -806,13 +819,6 @@ static ULONG WINAPI TransferThread(void *Dummy)
 //		if(TransPacketBase != NULL)
 		if(TrnSkt != INVALID_SOCKET && NextTransPacketBase != NULL)
 		{
-			if(strcmp(NextTransPacketBase->Cmd, "GOQUIT") == 0 && NextTransPacketBase != TransPacketBase)
-			{
-				ReleaseMutex(hListAccMutex);
-				BackgrndMessageProc();
-				Sleep(1);
-				continue;
-			}
 			Pos = NextTransPacketBase;
 			NextTransPacketBase = NextTransPacketBase->Next;
 			// ディレクトリ操作は非同期で行わない
@@ -841,6 +847,7 @@ static ULONG WINAPI TransferThread(void *Dummy)
 //			TransPacketBase->hWndTrans = hWndTrans;
 			Pos->hWndTrans = hWndTrans;
 			Pos->ctrl_skt = TrnSkt;
+			Pos->Abort = ABORT_NONE;
 			Pos->ThreadCount = ThreadCount;
 
 			if(hWndTrans != NULL)
@@ -856,6 +863,9 @@ static ULONG WINAPI TransferThread(void *Dummy)
 //				SendMessage(hWndTrans, WM_SET_PACKET, 0, (LPARAM)TransPacketBase);
 				SendMessage(hWndTrans, WM_SET_PACKET, 0, (LPARAM)Pos);
 
+			// 中断後に受信バッファに応答が残っていると次のコマンドの応答が正しく処理できない
+			RemoveReceivedData(TrnSkt);
+
 			/* ダウンロード */
 //			if(strncmp(TransPacketBase->Cmd, "RETR", 4) == 0)
 			if(strncmp(Pos->Cmd, "RETR", 4) == 0)
@@ -883,11 +893,11 @@ static ULONG WINAPI TransferThread(void *Dummy)
 						}
 
 						Down = YES;
-//						if(DoDownLoad(AskTrnCtrlSkt(), TransPacketBase, NO) == 429)
+//						if(DoDownload(AskTrnCtrlSkt(), TransPacketBase, NO) == 429)
 //						{
 //							if(ReConnectTrnSkt() == FFFTP_SUCCESS)
-//								DoDownLoad(AskTrnCtrlSkt(), TransPacketBase, NO, &Canceled);
-								DoDownLoad(TrnSkt, Pos, NO, &Canceled[Pos->ThreadCount]);
+//								DoDownload(AskTrnCtrlSkt(), TransPacketBase, NO, &Canceled);
+								DoDownload(TrnSkt, Pos, NO, &Canceled[Pos->ThreadCount]);
 //						}
 					}
 				}
@@ -905,12 +915,20 @@ static ULONG WINAPI TransferThread(void *Dummy)
 				if(MakeNonFullPath(Pos, CurDir[Pos->ThreadCount], Tmp) == FFFTP_SUCCESS)
 				{
 					Up = YES;
-//					if(DoUpLoad(AskTrnCtrlSkt(), TransPacketBase) == 429)
+//					if(DoUpload(AskTrnCtrlSkt(), TransPacketBase) == 429)
 //					{
 //						if(ReConnectTrnSkt() == FFFTP_SUCCESS)
-//							DoUpLoad(AskTrnCtrlSkt(), TransPacketBase);
-							DoUpLoad(TrnSkt, Pos);
+//							DoUpload(AskTrnCtrlSkt(), TransPacketBase);
+							DoUpload(TrnSkt, Pos);
 //					}
+
+					// ホスト側の日時設定
+					/* ファイルのタイムスタンプを合わせる */
+					if((SaveTimeStamp == YES) &&
+					   ((Pos->Time.dwLowDateTime != 0) || (Pos->Time.dwHighDateTime != 0)))
+					{
+						DoMFMT(TrnSkt, Pos->RemoteFile, &Pos->Time, &Canceled[Pos->ThreadCount]);
+					}
 				}
 				// 一部TYPE、STOR(RETR)、PORT(PASV)を並列に処理できないホストがあるため
 				ReleaseMutex(hListAccMutex);
@@ -1110,11 +1128,11 @@ static ULONG WINAPI TransferThread(void *Dummy)
 			}
 			/* 自動終了のための通知 */
 //			else if(strcmp(TransPacketBase->Cmd, "GOQUIT") == 0)
-			else if(strcmp(Pos->Cmd, "GOQUIT") == 0)
-			{
-				ReleaseMutex(hListAccMutex);
-				GoExit = YES;
-			}
+//			else if(strcmp(Pos->Cmd, "GOQUIT") == 0)
+//			{
+//				ReleaseMutex(hListAccMutex);
+//				GoExit = YES;
+//			}
 			else
 				ReleaseMutex(hListAccMutex);
 
@@ -1133,15 +1151,19 @@ static ULONG WINAPI TransferThread(void *Dummy)
 				{
 					for(i = 0; i < MAX_DATA_CONNECTION; i++)
 						Canceled[i] = YES;
-					EraseTransFileList();
+					if(Pos != NULL)
+						strcpy(Pos->Cmd, "");
 					Pos = NULL;
+					EraseTransFileList();
+					GoExit = YES;
 				}
 				else
 				{
 //					if((strncmp(TransPacketBase->Cmd, "RETR", 4) == 0) ||
 //					   (strncmp(TransPacketBase->Cmd, "STOR", 4) == 0))
 					if((strncmp(Pos->Cmd, "RETR", 4) == 0) ||
-					   (strncmp(Pos->Cmd, "STOR", 4) == 0))
+					   (strncmp(Pos->Cmd, "STOR", 4) == 0) ||
+					   (strncmp(Pos->Cmd, "STOU", 4) == 0))
 					{
 //						TransFiles--;
 						if(TransFiles > 0)
@@ -1152,7 +1174,7 @@ static ULONG WINAPI TransferThread(void *Dummy)
 //					TransPacketBase = TransPacketBase->Next;
 //					free(Pos);
 				}
-				ClearAll = NO;
+//				ClearAll = NO;
 				ReleaseMutex(hListAccMutex);
 
 				if(BackgrndMessageProc() == YES)
@@ -1171,8 +1193,25 @@ static ULONG WINAPI TransferThread(void *Dummy)
 //		else
 		else if(TransPacketBase == NULL)
 		{
+			ClearAll = NO;
 			DelNotify = NO;
 
+			if(GoExit == YES)
+			{
+				SoundPlay(SND_TRANS);
+				if(AskAutoExit() == NO)
+				{
+					if(Down == YES)
+						PostMessage(GetMainHwnd(), WM_REFRESH_LOCAL_FLG, 0, 0);
+					if(Up == YES)
+						PostMessage(GetMainHwnd(), WM_REFRESH_REMOTE_FLG, 0, 0);
+				}
+				Down = NO;
+				Up = NO;
+				PostMessage(GetMainHwnd(), WM_COMMAND, MAKEWPARAM(MENU_AUTO_EXIT, 0), 0);
+				GoExit = NO;
+			}
+
 			ReleaseMutex(hListAccMutex);
 			if(KeepDlg == NO)
 			{
@@ -1201,22 +1240,6 @@ static ULONG WINAPI TransferThread(void *Dummy)
 //			Sleep(1);
 			Sleep(100);
 
-			if(GoExit == YES)
-			{
-				SoundPlay(SND_TRANS);
-				if(AskAutoExit() == NO)
-				{
-					if(Down == YES)
-						PostMessage(GetMainHwnd(), WM_REFRESH_LOCAL_FLG, 0, 0);
-					if(Up == YES)
-						PostMessage(GetMainHwnd(), WM_REFRESH_REMOTE_FLG, 0, 0);
-				}
-				Down = NO;
-				Up = NO;
-				PostMessage(GetMainHwnd(), WM_COMMAND, MAKEWPARAM(MENU_AUTO_EXIT, 0), 0);
-				GoExit = NO;
-			}
-
 			// 再転送対応
 			TransferErrorMode = AskTransferErrorMode();
 			TransferErrorNotify = AskTransferErrorNotify();
@@ -1295,7 +1318,7 @@ static int MakeNonFullPath(TRANSPACKET *Pkt, char *Cur, char *Tmp)
 *		からも呼ばれる。メインのスレッドから呼ばれる時は Pkt->hWndTrans == NULL。
 *----------------------------------------------------------------------------*/
 
-int DoDownLoad(SOCKET cSkt, TRANSPACKET *Pkt, int DirList, int *CancelCheckWork)
+int DoDownload(SOCKET cSkt, TRANSPACKET *Pkt, int DirList, int *CancelCheckWork)
 {
 	int iRetCode;
 	char Reply[ERR_MSG_LEN+7];
@@ -1305,7 +1328,8 @@ int DoDownLoad(SOCKET cSkt, TRANSPACKET *Pkt, int DirList, int *CancelCheckWork)
 	{
 		iRetCode = 500;
 		SetTaskMsg(MSGJPN085, GetFileName(Pkt->LocalFile));
-		DispDownloadFinishMsg(Pkt, iRetCode);
+		// エラーによってはダイアログが表示されない場合があるバグ対策
+//		DispDownloadFinishMsg(Pkt, iRetCode);
 	}
 	else if(Pkt->Mode != EXIST_IGNORE)
 	{
@@ -1336,15 +1360,17 @@ int DoDownLoad(SOCKET cSkt, TRANSPACKET *Pkt, int DirList, int *CancelCheckWork)
 			else if(BackgrndMessageProc() == NO)
 			{
 				if(AskPasvMode() != YES)
-					iRetCode = DownLoadNonPassive(Pkt, CancelCheckWork);
+					iRetCode = DownloadNonPassive(Pkt, CancelCheckWork);
 				else
-					iRetCode = DownLoadPassive(Pkt, CancelCheckWork);
+					iRetCode = DownloadPassive(Pkt, CancelCheckWork);
 			}
 			else
 				iRetCode = 500;
 		}
 		else
 			SetErrorMsg(Reply);
+		// エラーによってはダイアログが表示されない場合があるバグ対策
+		DispDownloadFinishMsg(Pkt, iRetCode);
 	}
 	else
 	{
@@ -1365,13 +1391,15 @@ int DoDownLoad(SOCKET cSkt, TRANSPACKET *Pkt, int DirList, int *CancelCheckWork)
 *		int 応答コード
 *----------------------------------------------------------------------------*/
 
-static int DownLoadNonPassive(TRANSPACKET *Pkt, int *CancelCheckWork)
+static int DownloadNonPassive(TRANSPACKET *Pkt, int *CancelCheckWork)
 {
 	int iRetCode;
 	int iLength;
 	SOCKET data_socket = INVALID_SOCKET;   // data channel socket
 	SOCKET listen_socket = INVALID_SOCKET; // data listen socket
-	char Buf[1024];
+	// 念のため
+//	char Buf[1024];
+	char Buf[FMAX_PATH+1024];
 	int CreateMode;
 	// IPv6対応
 //	struct sockaddr_in saSockAddr1;
@@ -1437,16 +1465,16 @@ static int DownLoadNonPassive(TRANSPACKET *Pkt, int *CancelCheckWork)
 					// 一部TYPE、STOR(RETR)、PORT(PASV)を並列に処理できないホストがあるため
 					ReleaseMutex(hListAccMutex);
 					// FTPS対応
-//					iRetCode = DownLoadFile(Pkt, data_socket, CreateMode, CancelCheckWork);
+//					iRetCode = DownloadFile(Pkt, data_socket, CreateMode, CancelCheckWork);
 					if(IsSSLAttached(Pkt->ctrl_skt))
 					{
 						if(AttachSSL(data_socket, Pkt->ctrl_skt, CancelCheckWork))
-							iRetCode = DownLoadFile(Pkt, data_socket, CreateMode, CancelCheckWork);
+							iRetCode = DownloadFile(Pkt, data_socket, CreateMode, CancelCheckWork);
 						else
 							iRetCode = 500;
 					}
 					else
-						iRetCode = DownLoadFile(Pkt, data_socket, CreateMode, CancelCheckWork);
+						iRetCode = DownloadFile(Pkt, data_socket, CreateMode, CancelCheckWork);
 //					data_socket = DoClose(data_socket);
 				}
 			}
@@ -1466,7 +1494,8 @@ static int DownLoadNonPassive(TRANSPACKET *Pkt, int *CancelCheckWork)
 		iRetCode = 500;
 		SetErrorMsg(MSGJPN279);
 	}
-	DispDownloadFinishMsg(Pkt, iRetCode);
+	// エラーによってはダイアログが表示されない場合があるバグ対策
+//	DispDownloadFinishMsg(Pkt, iRetCode);
 
 	return(iRetCode);
 }
@@ -1481,11 +1510,13 @@ static int DownLoadNonPassive(TRANSPACKET *Pkt, int *CancelCheckWork)
 *		int 応答コード
 *----------------------------------------------------------------------------*/
 
-static int DownLoadPassive(TRANSPACKET *Pkt, int *CancelCheckWork)
+static int DownloadPassive(TRANSPACKET *Pkt, int *CancelCheckWork)
 {
 	int iRetCode;
 	SOCKET data_socket = INVALID_SOCKET;   // data channel socket
-	char Buf[1024];
+	// 念のため
+//	char Buf[1024];
+	char Buf[FMAX_PATH+1024];
 	int CreateMode;
 	// IPv6対応
 //	char Adrs[20];
@@ -1527,16 +1558,16 @@ static int DownLoadPassive(TRANSPACKET *Pkt, int *CancelCheckWork)
 						// 一部TYPE、STOR(RETR)、PORT(PASV)を並列に処理できないホストがあるため
 						ReleaseMutex(hListAccMutex);
 						// FTPS対応
-//						iRetCode = DownLoadFile(Pkt, data_socket, CreateMode, CancelCheckWork);
+//						iRetCode = DownloadFile(Pkt, data_socket, CreateMode, CancelCheckWork);
 						if(IsSSLAttached(Pkt->ctrl_skt))
 						{
 							if(AttachSSL(data_socket, Pkt->ctrl_skt, CancelCheckWork))
-								iRetCode = DownLoadFile(Pkt, data_socket, CreateMode, CancelCheckWork);
+								iRetCode = DownloadFile(Pkt, data_socket, CreateMode, CancelCheckWork);
 							else
 								iRetCode = 500;
 						}
 						else
-							iRetCode = DownLoadFile(Pkt, data_socket, CreateMode, CancelCheckWork);
+							iRetCode = DownloadFile(Pkt, data_socket, CreateMode, CancelCheckWork);
 //						data_socket = DoClose(data_socket);
 					}
 					else
@@ -1563,7 +1594,8 @@ static int DownLoadPassive(TRANSPACKET *Pkt, int *CancelCheckWork)
 	else
 		SetErrorMsg(Buf);
 
-	DispDownloadFinishMsg(Pkt, iRetCode);
+	// エラーによってはダイアログが表示されない場合があるバグ対策
+//	DispDownloadFinishMsg(Pkt, iRetCode);
 
 	return(iRetCode);
 }
@@ -1585,7 +1617,7 @@ static int DownLoadPassive(TRANSPACKET *Pkt, int *CancelCheckWork)
 *			ダイアログを出さない場合、このルーチンからDispDownloadSize()を呼ぶ
 *----------------------------------------------------------------------------*/
 
-static int DownLoadFile(TRANSPACKET *Pkt, SOCKET dSkt, int CreateMode, int *CancelCheckWork)
+static int DownloadFile(TRANSPACKET *Pkt, SOCKET dSkt, int CreateMode, int *CancelCheckWork)
 {
 	int iNumBytes;
 	char Buf[BUFSIZE];
@@ -2251,7 +2283,9 @@ static int DownLoadFile(TRANSPACKET *Pkt, SOCKET dSkt, int CreateMode, int *Canc
 		SetErrorMsg(MSGJPN096);
 		SetTaskMsg(MSGJPN096);
 	}
-	if(iRetCode >= FTP_RETRY)
+	// バグ修正
+//	if(iRetCode >= FTP_RETRY)
+	if((iRetCode/100) >= FTP_RETRY)
 		SetErrorMsg(Buf);
 	if(Pkt->Abort != ABORT_NONE)
 		iRetCode = 500;
@@ -2274,6 +2308,8 @@ static void DispDownloadFinishMsg(TRANSPACKET *Pkt, int iRetCode)
 {
 	char Fname[FMAX_PATH+1];
 
+	// 同時接続対応
+	ReleaseMutex(hListAccMutex);
 	if(ForceAbort == NO)
 	{
 		if((iRetCode/100) >= FTP_CONTINUE)
@@ -2293,7 +2329,9 @@ static void DispDownloadFinishMsg(TRANSPACKET *Pkt, int iRetCode)
 				return;
 #endif
 
-			if((strncmp(Pkt->Cmd, "NLST", 4) == 0) || (strncmp(Pkt->Cmd, "LIST", 4) == 0))
+			// MLSD対応
+//			if((strncmp(Pkt->Cmd, "NLST", 4) == 0) || (strncmp(Pkt->Cmd, "LIST", 4) == 0))
+			if((strncmp(Pkt->Cmd, "NLST", 4) == 0) || (strncmp(Pkt->Cmd, "LIST", 4) == 0) || (strncmp(Pkt->Cmd, "MLSD", 4) == 0))
 			{
 				SetTaskMsg(MSGJPN097);
 				strcpy(Fname, MSGJPN098);
@@ -2330,7 +2368,9 @@ static void DispDownloadFinishMsg(TRANSPACKET *Pkt, int iRetCode)
 		}
 		else
 		{
-			if((strncmp(Pkt->Cmd, "NLST", 4) == 0) || (strncmp(Pkt->Cmd, "LIST", 4) == 0))
+			// MLSD対応
+//			if((strncmp(Pkt->Cmd, "NLST", 4) == 0) || (strncmp(Pkt->Cmd, "LIST", 4) == 0))
+			if((strncmp(Pkt->Cmd, "NLST", 4) == 0) || (strncmp(Pkt->Cmd, "LIST", 4) == 0) || (strncmp(Pkt->Cmd, "MLSD", 4) == 0))
 				SetTaskMsg(MSGJPN101, Pkt->ExistSize);
 			// 同時接続対応
 //			else if((Pkt->hWndTrans != NULL) && (TimeStart != 0))
@@ -2544,7 +2584,7 @@ static INT_PTR CALLBACK NoResumeWndProc(HWND hDlg, UINT iMessage, WPARAM wParam,
 *		int 応答コード
 *----------------------------------------------------------------------------*/
 
-static int DoUpLoad(SOCKET cSkt, TRANSPACKET *Pkt)
+static int DoUpload(SOCKET cSkt, TRANSPACKET *Pkt)
 {
 	int iRetCode;
 	char Reply[ERR_MSG_LEN+7];
@@ -2578,9 +2618,9 @@ static int DoUpLoad(SOCKET cSkt, TRANSPACKET *Pkt)
 				else if(BackgrndMessageProc() == NO)
 				{
 					if(AskPasvMode() != YES)
-						iRetCode = UpLoadNonPassive(Pkt);
+						iRetCode = UploadNonPassive(Pkt);
 					else
-						iRetCode = UpLoadPassive(Pkt);
+						iRetCode = UploadPassive(Pkt);
 				}
 				else
 					iRetCode = 500;
@@ -2600,8 +2640,11 @@ static int DoUpLoad(SOCKET cSkt, TRANSPACKET *Pkt)
 			SetTaskMsg(MSGJPN105, Pkt->LocalFile);
 			iRetCode = 500;
 			Pkt->Abort = ABORT_ERROR;
-			DispUploadFinishMsg(Pkt, iRetCode);
+			// エラーによってはダイアログが表示されない場合があるバグ対策
+//			DispUploadFinishMsg(Pkt, iRetCode);
 		}
+		// エラーによってはダイアログが表示されない場合があるバグ対策
+		DispUploadFinishMsg(Pkt, iRetCode);
 	}
 	else
 	{
@@ -2622,13 +2665,15 @@ static int DoUpLoad(SOCKET cSkt, TRANSPACKET *Pkt)
 *		int 応答コード
 *----------------------------------------------------------------------------*/
 
-static int UpLoadNonPassive(TRANSPACKET *Pkt)
+static int UploadNonPassive(TRANSPACKET *Pkt)
 {
 	int iRetCode;
 	int iLength;
 	SOCKET data_socket = INVALID_SOCKET;   // data channel socket
 	SOCKET listen_socket = INVALID_SOCKET; // data listen socket
-	char Buf[1024];
+	// 念のため
+//	char Buf[1024];
+	char Buf[FMAX_PATH+1024];
 	// IPv6対応
 //	struct sockaddr_in saSockAddr1;
 	struct sockaddr_in saSockAddrIPv4;
@@ -2661,6 +2706,10 @@ static int UpLoadNonPassive(TRANSPACKET *Pkt)
 		iRetCode = command(Pkt->ctrl_skt, Reply, &Canceled[Pkt->ThreadCount], "%s", Buf);
 		if((iRetCode/100) == FTP_PRELIM)
 		{
+			// STOUの応答を処理
+			// 応答の形式に規格が無くファイル名を取得できないため属性変更を無効化
+			if(Pkt->Mode == EXIST_UNIQUE)
+				Pkt->Attr = -1;
 			// 同時接続対応
 //			if(SocksGet2ndBindReply(listen_socket, &data_socket) == FFFTP_FAIL)
 			if(SocksGet2ndBindReply(listen_socket, &data_socket, &Canceled[Pkt->ThreadCount]) == FFFTP_FAIL)
@@ -2711,16 +2760,16 @@ static int UpLoadNonPassive(TRANSPACKET *Pkt)
 				// 一部TYPE、STOR(RETR)、PORT(PASV)を並列に処理できないホストがあるため
 				ReleaseMutex(hListAccMutex);
 				// FTPS対応
-//				iRetCode = UpLoadFile(Pkt, data_socket);
+//				iRetCode = UploadFile(Pkt, data_socket);
 				if(IsSSLAttached(Pkt->ctrl_skt))
 				{
 					if(AttachSSL(data_socket, Pkt->ctrl_skt, &Canceled[Pkt->ThreadCount]))
-						iRetCode = UpLoadFile(Pkt, data_socket);
+						iRetCode = UploadFile(Pkt, data_socket);
 					else
 						iRetCode = 500;
 				}
 				else
-					iRetCode = UpLoadFile(Pkt, data_socket);
+					iRetCode = UploadFile(Pkt, data_socket);
 				data_socket = DoClose(data_socket);
 			}
 		}
@@ -2737,7 +2786,8 @@ static int UpLoadNonPassive(TRANSPACKET *Pkt)
 		SetErrorMsg(MSGJPN279);
 		iRetCode = 500;
 	}
-	DispUploadFinishMsg(Pkt, iRetCode);
+	// エラーによってはダイアログが表示されない場合があるバグ対策
+//	DispUploadFinishMsg(Pkt, iRetCode);
 
 	return(iRetCode);
 }
@@ -2752,11 +2802,13 @@ static int UpLoadNonPassive(TRANSPACKET *Pkt)
 *		int 応答コード
 *----------------------------------------------------------------------------*/
 
-static int UpLoadPassive(TRANSPACKET *Pkt)
+static int UploadPassive(TRANSPACKET *Pkt)
 {
 	int iRetCode;
 	SOCKET data_socket = INVALID_SOCKET;   // data channel socket
-	char Buf[1024];
+	// 念のため
+//	char Buf[1024];
+	char Buf[FMAX_PATH+1024];
 	// IPv6対応
 //	char Adrs[20];
 	char Adrs[40];
@@ -2814,19 +2866,23 @@ static int UpLoadPassive(TRANSPACKET *Pkt)
 				iRetCode = command(Pkt->ctrl_skt, Reply, &Canceled[Pkt->ThreadCount], "%s", Buf);
 				if(iRetCode/100 == FTP_PRELIM)
 				{
+					// STOUの応答を処理
+					// 応答の形式に規格が無くファイル名を取得できないため属性変更を無効化
+					if(Pkt->Mode == EXIST_UNIQUE)
+						Pkt->Attr = -1;
 					// 一部TYPE、STOR(RETR)、PORT(PASV)を並列に処理できないホストがあるため
 					ReleaseMutex(hListAccMutex);
 					// FTPS対応
-//					iRetCode = UpLoadFile(Pkt, data_socket);
+//					iRetCode = UploadFile(Pkt, data_socket);
 					if(IsSSLAttached(Pkt->ctrl_skt))
 					{
 						if(AttachSSL(data_socket, Pkt->ctrl_skt, &Canceled[Pkt->ThreadCount]))
-							iRetCode = UpLoadFile(Pkt, data_socket);
+							iRetCode = UploadFile(Pkt, data_socket);
 						else
 							iRetCode = 500;
 					}
 					else
-						iRetCode = UpLoadFile(Pkt, data_socket);
+						iRetCode = UploadFile(Pkt, data_socket);
 
 					data_socket = DoClose(data_socket);
 				}
@@ -2854,7 +2910,8 @@ static int UpLoadPassive(TRANSPACKET *Pkt)
 	else
 		SetErrorMsg(Buf);
 
-	DispUploadFinishMsg(Pkt, iRetCode);
+	// エラーによってはダイアログが表示されない場合があるバグ対策
+//	DispUploadFinishMsg(Pkt, iRetCode);
 
 	return(iRetCode);
 }
@@ -2874,7 +2931,7 @@ static int UpLoadPassive(TRANSPACKET *Pkt)
 *		転送ダイアログを出さないでアップロードすることはない
 *----------------------------------------------------------------------------*/
 
-static int UpLoadFile(TRANSPACKET *Pkt, SOCKET dSkt)
+static int UploadFile(TRANSPACKET *Pkt, SOCKET dSkt)
 {
 	DWORD iNumBytes;
 	HANDLE iFileHandle;
@@ -3494,7 +3551,9 @@ static int UpLoadFile(TRANSPACKET *Pkt, SOCKET dSkt)
 //#pragma aaa
 //DoPrintf("##UP REPLY : %s", Buf);
 
-	if(iRetCode >= FTP_RETRY)
+	// バグ修正
+//	if(iRetCode >= FTP_RETRY)
+	if((iRetCode/100) >= FTP_RETRY)
 		SetErrorMsg(Buf);
 
 	if(Pkt->Abort != ABORT_NONE)
@@ -3565,6 +3624,8 @@ static int TermCodeConvAndSend(TERMCODECONVINFO *tInfo, SOCKET Skt, char *Data,
 
 static void DispUploadFinishMsg(TRANSPACKET *Pkt, int iRetCode)
 {
+	// 同時接続対応
+	ReleaseMutex(hListAccMutex);
 	if(ForceAbort == NO)
 	{
 		if((iRetCode/100) >= FTP_CONTINUE)
@@ -3724,8 +3785,6 @@ static LRESULT CALLBACK TransDlgProc(HWND hDlg, UINT Msg, WPARAM wParam, LPARAM
 //				if(!(Pkt = (TRANSPACKET*)GetWindowLong(hDlg, GWL_USERDATA)))
 				if(!(Pkt = (TRANSPACKET*)GetWindowLongPtr(hDlg, GWLP_USERDATA)))
 					break;
-				if(Canceled[Pkt->ThreadCount] == YES)
-					Pkt->Abort = ABORT_USER;
 				DispTransferStatus(hDlg, NO, Pkt);
 				SetTimer(hDlg, TIMER_DISPLAY, DISPLAY_TIMING, NULL);
 			}
@@ -4009,7 +4068,7 @@ static int GetAdrsAndPortIPv6(SOCKET Skt, char *Str, char *Adrs, int *Port, int
 	char *Pos;
 	char *Btm;
 	int Sts;
-	int i;
+//	int i;
 	struct sockaddr_in6 SockAddr;
 
 	Sts = FFFTP_FAIL;
@@ -4038,8 +4097,9 @@ static int GetAdrsAndPortIPv6(SOCKET Skt, char *Str, char *Adrs, int *Port, int
 						}
 						else
 						{
-							i = sizeof(SockAddr);
-							if(getpeername(Skt, (struct sockaddr*)&SockAddr, &i) != SOCKET_ERROR)
+//							i = sizeof(SockAddr);
+//							if(getpeername(Skt, (struct sockaddr*)&SockAddr, &i) != SOCKET_ERROR)
+							if(GetAsyncTableDataIPv6(Skt, &SockAddr, NULL) == YES)
 								AddressToStringIPv6(Adrs, &SockAddr.sin6_addr);
 						}