Tera TermRevision: 9004
https://osdn.net/projects/ttssh2/scm/svn/commits/9004
Author: zmatsuo
Date: 2020-11-02 00:37:20 +0900 (Mon, 02 Nov 2020)
Log Message:
-----------
不要部分削除
Modified Paths:
--------------
branches/proto_unicode/teraterm/common/ttftypes.h
branches/proto_unicode/teraterm/teraterm/filesys_proto.cpp
branches/proto_unicode/teraterm/teraterm/filesys_proto.h
branches/proto_unicode/teraterm/ttpfile/ftlib.c
-------------- next part --------------
Modified: branches/proto_unicode/teraterm/common/ttftypes.h
===================================================================
--- branches/proto_unicode/teraterm/common/ttftypes.h 2020-11-01 15:37:07 UTC (rev 9003)
+++ branches/proto_unicode/teraterm/common/ttftypes.h 2020-11-01 15:37:20 UTC (rev 9004)
@@ -37,23 +37,6 @@
#define PROTO_QV 5
#define PROTO_YM 6
-//#define OpLog 1
-//#define OpSendFile 2
-#define OpKmtRcv 3
-#define OpKmtGet 4
-#define OpKmtSend 5
-#define OpKmtFin 6
-#define OpXRcv 7
-#define OpXSend 8
-#define OpZRcv 9
-#define OpZSend 10
-#define OpBPRcv 11
-#define OpBPSend 12
-#define OpQVRcv 13
-#define OpQVSend 14
-#define OpYRcv 15
-#define OpYSend 16
-
#define TitLog "Log"
#define TitSendFile "Send file"
#define TitKmtRcv "Kermit Receive"
Modified: branches/proto_unicode/teraterm/teraterm/filesys_proto.cpp
===================================================================
--- branches/proto_unicode/teraterm/teraterm/filesys_proto.cpp 2020-11-01 15:37:07 UTC (rev 9003)
+++ branches/proto_unicode/teraterm/teraterm/filesys_proto.cpp 2020-11-01 15:37:20 UTC (rev 9004)
@@ -65,6 +65,21 @@
#include "bplus.h"
#include "quickvan.h"
+#define OpKmtRcv 3
+#define OpKmtGet 4
+#define OpKmtSend 5
+#define OpKmtFin 6
+#define OpXRcv 7
+#define OpXSend 8
+#define OpZRcv 9
+#define OpZSend 10
+#define OpBPRcv 11
+#define OpBPSend 12
+#define OpQVRcv 13
+#define OpQVSend 14
+#define OpYRcv 15
+#define OpYSend 16
+
static PFileVarProto FileVar = NULL;
static int ProtoId;
@@ -133,11 +148,6 @@
AppendSlash(FileDirExpanded, _countof(FileDirExpanded));
fv->RecievePath = _strdup(FileDirExpanded);
- // \x8E\xF3\x90M\x83t\x83H\x83\x8B\x83_\x82\xF0 fv->FullName \x82ɐݒ肵\x82Ă\xA8\x82\xAD
- // fv->FullName[fv->DirLen] \x82\xA9\x82\xE7\x83t\x83@\x83C\x83\x8B\x96\xBC\x82\xF0\x90ݒ肷\x82\xE9\x82ƃt\x83\x8B\x83p\x83X\x82ɂȂ\xE9
- strncpy_s(fv->FullName, sizeof(fv->FullName), FileDirExpanded, _TRUNCATE);
- // fv->DirLen = strlen(fv->FullName);
-
fv->FileOpen = FALSE;
fv->OverWrite = ((ts.FTFlag & FT_RENAME) == 0);
fv->HMainWin = HVTWin;
@@ -659,9 +669,6 @@
char **ret = NULL;
if (Ok) {
- //fv->DirLen = ofn.nFileOffset;
- //fv->FnPtr = ofn.nFileOffset;
-
if (Receive)
*Option = opt;
else
@@ -920,18 +927,6 @@
return ret;
}
-#if 0
-static void _SetFileVar(PFileVarProto fv)
-{
- int i;
- char c;
-
- GetFileNamePos(fv->FullName,&(fv->DirLen),&i);
- c = fv->FullName[fv->DirLen];
- if (c=='\\'||c=='/') fv->DirLen++;
-}
-#endif
-
static void KermitStart(int mode)
{
if (! ProtoStart())
@@ -1014,8 +1009,6 @@
else {
strncpy_s(FileVar->FullName, sizeof(FileVar->FullName),filename, _TRUNCATE);
FileVar->NoMsg = TRUE;
-// FileVar->DirLen = 0;
-// _SetFileVar(FileVar);
}
KermitStart(IdKmtGet);
@@ -1656,11 +1649,11 @@
ProtoEnd();
return FALSE;
}
+ fv->FileNames = filenames;
}
else {
- strncpy_s(FileVar->FullName, sizeof(FileVar->FullName),filename, _TRUNCATE);
+ fv->FileNames = MakeStrArrayFromStr(filename);
FileVar->NoMsg = TRUE;
-// FileVar->DirLen = 0;
}
TalkStatus = IdTalkQuiet;
Modified: branches/proto_unicode/teraterm/teraterm/filesys_proto.h
===================================================================
--- branches/proto_unicode/teraterm/teraterm/filesys_proto.h 2020-11-01 15:37:07 UTC (rev 9003)
+++ branches/proto_unicode/teraterm/teraterm/filesys_proto.h 2020-11-01 15:37:20 UTC (rev 9004)
@@ -29,14 +29,15 @@
#pragma once
typedef struct FileVarProto {
+ // protosys_proto.cpp\x93\xE0\x82̂ݎg\x97p
+ WORD OpId;
+
HWND HMainWin;
HWND HWin;
- WORD OpId;
char DlgCaption[40];
// \x91\x97\x8E\xF3\x90M\x8E\x9E\x83\x8F\x81[\x83N
char FullName[MAX_PATH]; // read/write\x82\xB7\x82\xE9\x83t\x83@\x83C\x83\x8B\x96\xBC(\x8Ae\x83v\x83\x8D\x83g\x83R\x83\x8B\x93\xE0\x82ŏ\x91\x82\xAB\x8A\xB7\x82\xA6\x82\xB7\x82邱\x82Ƃ\xA0\x82\xE8)
-// int DirLen;
// \x91\x97\x90M\x83t\x83@\x83C\x83\x8B\x96\xBC\x94z\x97\xF1
// \x83t\x83\x8B\x83p\x83X\x82̃t\x83@\x83C\x83\x8B\x96\xBC\x94z\x97\xF1(\x88\xEA\x94ԍŌ\xE3\x82\xCDNULL)
Modified: branches/proto_unicode/teraterm/ttpfile/ftlib.c
===================================================================
--- branches/proto_unicode/teraterm/ttpfile/ftlib.c 2020-11-01 15:37:07 UTC (rev 9003)
+++ branches/proto_unicode/teraterm/ttpfile/ftlib.c 2020-11-01 15:37:20 UTC (rev 9004)
@@ -54,8 +54,6 @@
BOOL GetNextFname(PFileVarProto fv)
{
- int i;
-
const char *f = fv->FileNames[fv->FNCount];
if (f == NULL) {
return FALSE; /* no more file name */
@@ -63,9 +61,6 @@
fv->FNCount++;
strncpy_s(fv->FullName, sizeof(fv->FullName), f, _TRUNCATE);
-// GetFileNamePos(fv->FullName, &(fv->DirLen), &i);
-// fv->DirLen++; // \x88\xEA\x94ԍŌ\xE3\x82\xCC '\\' \x82\xF0\x8Ew\x82\xB5\x82Ă\xA2\x82\xE9\x82̂\xC5 +1 \x82\xB5\x82Ă\xA8\x82\xAD
-
return TRUE;
}