Tera Term

[Ttssh2-commit] [9098] GetNextFname() を TFileVarProto　のメンバーにした

• 前の記事 (スレッド) [Ttssh2-commit] [9097] GetNextFname() の仕様を変更
• 次の記事 (スレッド) [Ttssh2-commit] [9099] GetRecievePath() を TFileVarProto に追加
• 記事の並び順: [ 日付 ] [ スレッド ] [ 件名 ] [ 著者 ]

Revision: 9098
          https://osdn.net/projects/ttssh2/scm/svn/commits/9098
Author:   zmatsuo
Date:     2020-12-20 21:15:10 +0900 (Sun, 20 Dec 2020)
Log Message:
-----------
GetNextFname() を TFileVarProto　のメンバーにした

Modified Paths:
--------------
    trunk/teraterm/teraterm/filesys_proto.cpp
    trunk/teraterm/teraterm/filesys_proto.h
    trunk/teraterm/ttpfile/bplus.h
    trunk/teraterm/ttpfile/ftlib.c
    trunk/teraterm/ttpfile/ftlib.h
    trunk/teraterm/ttpfile/kermit.c
    trunk/teraterm/ttpfile/quickvan.c
    trunk/teraterm/ttpfile/quickvan.h
    trunk/teraterm/ttpfile/xmodem.c
    trunk/teraterm/ttpfile/ymodem.c
    trunk/teraterm/ttpfile/zmodem.c
    trunk/teraterm/ttpfile/zmodem.h

-------------- next part --------------
Modified: trunk/teraterm/teraterm/filesys_proto.cpp
===================================================================
--- trunk/teraterm/teraterm/filesys_proto.cpp	2020-12-20 12:14:54 UTC (rev 9097)
+++ trunk/teraterm/teraterm/filesys_proto.cpp	2020-12-20 12:15:10 UTC (rev 9098)
@@ -132,6 +132,25 @@
 	InitDlgProgress(fv->HWin, IDC_PROTOPROGRESS, CurProgStat);
 }
 
+/**
+ *	\x83t\x83@\x83C\x83\x8B\x96\xBC\x82\xF0\x8E擾
+ *
+ *	@return		\x83t\x83@\x83C\x83\x8B\x96\xBC
+ *				NULL\x82̂Ƃ\xAB\x8E\x9F\x82̃t\x83@\x83C\x83\x8B\x82͂Ȃ\xA2
+ *				\x95s\x97v\x82ɂȂ\xC1\x82\xBD\x82\xE7 free() \x82\xB7\x82邱\x82\xC6
+ */
+static char *GetNextFname(PFileVarProto fv)
+{
+	char *f = fv->FileNames[fv->FNCount];
+	if (f == NULL) {
+		/* no more file name */
+		return NULL;
+	}
+	fv->FNCount++;
+	f = _strdup(f);
+	return f;
+}
+
 static void FTSetTimeOut(PFileVarProto fv, int T)
 {
 	KillTimer(fv->HMainWin, IdProtoTimer);
@@ -164,6 +183,7 @@
 
 	fv->file = FilesysCreateWin32();
 
+	fv->GetNextFname = GetNextFname;
 	fv->FTSetTimeOut = FTSetTimeOut;
 
 	fv->InitDlgProgress = _InitDlgProgress;

Modified: trunk/teraterm/teraterm/filesys_proto.h
===================================================================
--- trunk/teraterm/teraterm/filesys_proto.h	2020-12-20 12:14:54 UTC (rev 9097)
+++ trunk/teraterm/teraterm/filesys_proto.h	2020-12-20 12:15:10 UTC (rev 9098)
@@ -62,6 +62,7 @@
 	DWORD FileMtime;
 
 	// services
+	char *(*GetNextFname)(struct FileVarProto *fv);
 	void (*FTSetTimeOut)(struct FileVarProto *fv, int T);
 
 	// protocol entrys, data

Modified: trunk/teraterm/ttpfile/bplus.h
===================================================================
--- trunk/teraterm/ttpfile/bplus.h	2020-12-20 12:14:54 UTC (rev 9097)
+++ trunk/teraterm/ttpfile/bplus.h	2020-12-20 12:15:10 UTC (rev 9098)
@@ -29,6 +29,9 @@
 
 /* TTFILE.DLL, B-Plus protocol */
 
+#pragma once
+#include "filesys_proto.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif

Modified: trunk/teraterm/ttpfile/ftlib.c
===================================================================
--- trunk/teraterm/ttpfile/ftlib.c	2020-12-20 12:14:54 UTC (rev 9097)
+++ trunk/teraterm/ttpfile/ftlib.c	2020-12-20 12:15:10 UTC (rev 9098)
@@ -39,25 +39,6 @@
 #include "ftlib.h"
 #include "tt_res.h"
 
-/**
- *	\x83t\x83@\x83C\x83\x8B\x96\xBC\x82\xF0\x8E擾
- *
- *	@return		\x83t\x83@\x83C\x83\x8B\x96\xBC
- *				NULL\x82̂Ƃ\xAB\x8E\x9F\x82̃t\x83@\x83C\x83\x8B\x82͂Ȃ\xA2
- *				\x95s\x97v\x82ɂȂ\xC1\x82\xBD\x82\xE7 free() \x82\xB7\x82邱\x82\xC6
- */
-char *GetNextFname(PFileVarProto fv)
-{
-	char *f = fv->FileNames[fv->FNCount];
-	if (f == NULL) {
-		/* no more file name */
-		return NULL;
-	}
-	fv->FNCount++;
-	f = _strdup(f);
-	return f;
-}
-
 WORD UpdateCRC(BYTE b, WORD CRC)
 {
   int i;

Modified: trunk/teraterm/ttpfile/ftlib.h
===================================================================
--- trunk/teraterm/ttpfile/ftlib.h	2020-12-20 12:14:54 UTC (rev 9097)
+++ trunk/teraterm/ttpfile/ftlib.h	2020-12-20 12:15:10 UTC (rev 9098)
@@ -29,14 +29,10 @@
 
 /* TTFILE.DLL, routines for file transfer protocol */
 
-#include "filesys_proto.h"
-
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-void GetLongFName(PCHAR FullName, PCHAR LongName, int destlen);
-char *GetNextFname(PFileVarProto fv);
 WORD UpdateCRC(BYTE b, WORD CRC);
 LONG UpdateCRC32(BYTE b, LONG CRC);
 

Modified: trunk/teraterm/ttpfile/kermit.c
===================================================================
--- trunk/teraterm/ttpfile/kermit.c	2020-12-20 12:14:54 UTC (rev 9097)
+++ trunk/teraterm/ttpfile/kermit.c	2020-12-20 12:15:10 UTC (rev 9098)
@@ -1051,7 +1051,7 @@
 	BOOL r;
 	char *filename;
 
-	filename = GetNextFname(fv);
+	filename = fv->GetNextFname(fv);
 	if (filename == NULL)
 	{
 		KmtSendEOTPacket(fv,kv,cv);

Modified: trunk/teraterm/ttpfile/quickvan.c
===================================================================
--- trunk/teraterm/ttpfile/quickvan.c	2020-12-20 12:14:54 UTC (rev 9097)
+++ trunk/teraterm/ttpfile/quickvan.c	2020-12-20 12:15:10 UTC (rev 9098)
@@ -858,7 +858,7 @@
   TFileIO *file = fv->file;
   char *filename;
 
-  filename = GetNextFname(fv);
+  filename = fv->GetNextFname(fv);
   if (filename == NULL)
   {
     QVSendEOT(fv,qv,cv);

Modified: trunk/teraterm/ttpfile/quickvan.h
===================================================================
--- trunk/teraterm/ttpfile/quickvan.h	2020-12-20 12:14:54 UTC (rev 9097)
+++ trunk/teraterm/ttpfile/quickvan.h	2020-12-20 12:15:10 UTC (rev 9098)
@@ -29,6 +29,9 @@
 
 /* TTFILE.DLL, Quick-VAN protocol */
 
+#pragma once
+#include "filesys_proto.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif

Modified: trunk/teraterm/ttpfile/xmodem.c
===================================================================
--- trunk/teraterm/ttpfile/xmodem.c	2020-12-20 12:14:54 UTC (rev 9097)
+++ trunk/teraterm/ttpfile/xmodem.c	2020-12-20 12:15:10 UTC (rev 9098)
@@ -228,7 +228,7 @@
 		log->LogState = 0;
 	}
 
-	xv->FullName = GetNextFname(fv);
+	xv->FullName = fv->GetNextFname(fv);
 	if (xv->XMode == IdXSend) {
 		fv->FileOpen = file->OpenRead(file, xv->FullName);
 		if (fv->FileOpen == FALSE) {

Modified: trunk/teraterm/ttpfile/ymodem.c
===================================================================
--- trunk/teraterm/ttpfile/ymodem.c	2020-12-20 12:14:54 UTC (rev 9097)
+++ trunk/teraterm/ttpfile/ymodem.c	2020-12-20 12:15:10 UTC (rev 9098)
@@ -337,7 +337,7 @@
 	PYVar yv = fv->data;
 
 	if (yv->YMode == IdYSend) {
-		char *filename = GetNextFname(fv);
+		char *filename = fv->GetNextFname(fv);
 		if (filename == NULL) {
 			return FALSE;
 		}
@@ -746,7 +746,7 @@
 					yv->SendEot = 0;
 
 					// \x91\x97\x90M\x83t\x83@\x83C\x83\x8B\x82\xAA\x8Ec\x82\xC1\x82Ă\xA2\x82Ȃ\xA2\x8Fꍇ\x82́A\x81u\x91S\x82Ẵt\x83@\x83C\x83\x8B\x82\xF0\x93]\x91\x97\x8FI\x97\xB9\x81v\x82\xF0\x92ʒm\x82\xB7\x82\xE9\x81B
-					filename = GetNextFname(fv);
+					filename = fv->GetNextFname(fv);
 					if (filename == NULL)
 					{
 						// If it is the last file.

Modified: trunk/teraterm/ttpfile/zmodem.c
===================================================================
--- trunk/teraterm/ttpfile/zmodem.c	2020-12-20 12:14:54 UTC (rev 9097)
+++ trunk/teraterm/ttpfile/zmodem.c	2020-12-20 12:15:10 UTC (rev 9098)
@@ -866,7 +866,7 @@
 		}
 	}
 
-	filename = GetNextFname(fv);
+	filename = fv->GetNextFname(fv);
 	if (filename == NULL) {
 		zv->ZState = Z_SendFIN;
 		ZSendFIN(zv);

Modified: trunk/teraterm/ttpfile/zmodem.h
===================================================================
--- trunk/teraterm/ttpfile/zmodem.h	2020-12-20 12:14:54 UTC (rev 9097)
+++ trunk/teraterm/ttpfile/zmodem.h	2020-12-20 12:15:10 UTC (rev 9098)
@@ -29,6 +29,9 @@
 
 /* TTFILE.DLL, ZMODEM protocol */
 
+#pragma once
+#include "filesys_proto.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif

• 前の記事 (スレッド) [Ttssh2-commit] [9097] GetNextFname() の仕様を変更
• 次の記事 (スレッド) [Ttssh2-commit] [9099] GetRecievePath() を TFileVarProto に追加
• 記事の並び順: [ 日付 ] [ スレッド ] [ 件名 ] [ 著者 ]