[ttssh2-commit] [9707] TTSSH.LOG の出力先をログ保存フォルダ(%LOCALAPPDATA%\teraterm5)に変更

Back to archive index
scmno****@osdn***** scmno****@osdn*****
2022年 1月 29日 (土) 08:49:12 JST


Revision: 9707
          https://osdn.net/projects/ttssh2/scm/svn/commits/9707
Author:   nmaya
Date:     2022-01-29 08:49:12 +0900 (Sat, 29 Jan 2022)
Log Message:
-----------
TTSSH.LOG の出力先をログ保存フォルダ(%LOCALAPPDATA%\teraterm5)に変更

#43507

Ticket Links:
------------
    https://osdn.net/projects/ttssh2/tracker/detail/43507

Modified Paths:
--------------
    trunk/ttssh2/ttxssh/ttxssh.c
    trunk/ttssh2/ttxssh/ttxssh.h

-------------- next part --------------
Modified: trunk/ttssh2/ttxssh/ttxssh.c
===================================================================
--- trunk/ttssh2/ttxssh/ttxssh.c	2022-01-28 16:36:06 UTC (rev 9706)
+++ trunk/ttssh2/ttxssh/ttxssh.c	2022-01-28 23:49:12 UTC (rev 9707)
@@ -800,9 +800,9 @@
 	if (level <= pvar->settings.LogLevel) {
 		int file;
 
-		wchar_t *fname = get_teraterm_dir_relative_nameW(L"TTSSH.LOG");
+		wchar_t *fname = get_log_dir_relative_nameW(L"TTSSH.LOG");
 		file = _wopen(fname, _O_RDWR | _O_APPEND | _O_CREAT | _O_TEXT,
-					  _S_IREAD | _S_IWRITE);
+		              _S_IREAD | _S_IWRITE);
 		free(fname);
 
 		if (file >= 0) {
@@ -2446,7 +2446,7 @@
 }
 
 /**
- *	\x83t\x83@\x83C\x83\x8B\x96\xBC\x82\xF0\x83t\x83\x8B\x83p\x83X\x82ɕϊ\xB7\x82\xB7\x82\xE9
+ *	\x83t\x83@\x83C\x83\x8B\x96\xBC\x82\xF0 exe \x82̂\xA0\x82\xE9\x83t\x83H\x83\x8B\x83_\x82\xA9\x82\xE7\x82̑\x8A\x91΃p\x83X\x82Ƃ݂Ȃ\xB5\x81A\x83t\x83\x8B\x83p\x83X\x82ɕϊ\xB7\x82\xB7\x82\xE9
  *	@return	\x83t\x83\x8B\x83p\x83X\x83t\x83@\x83C\x83\x8B\x96\xBC
  *			free()\x82\xB7\x82邱\x82\xC6
  */
@@ -2533,7 +2533,8 @@
 }
 
 /**
- *	\x83t\x83@\x83C\x83\x8B\x96\xBC\x82\xF0\x83t\x83\x8B\x83p\x83X\x82ɕϊ\xB7\x82\xB7\x82\xE9
+ *	\x83t\x83@\x83C\x83\x8B\x96\xBC\x82\xF0\x8Cl\x97p\x90ݒ\xE8\x83t\x83@\x83C\x83\x8B\x83t\x83H\x83\x8B\x83_\x82\xA9\x82\xE7\x82̑\x8A\x91΃p\x83X\x82Ƃ݂Ȃ\xB5\x81A\x83t\x83\x8B\x83p\x83X\x82ɕϊ\xB7\x82\xB7\x82\xE9
+ *		%APPDATA%\teraterm5 (%USERPROFILE%\AppData\Roaming\teraterm5)
  *	@return	\x83t\x83\x8B\x83p\x83X\x83t\x83@\x83C\x83\x8B\x96\xBC
  *			free()\x82\xB7\x82邱\x82\xC6
  */
@@ -2550,6 +2551,25 @@
 	return path;
 }
 
+/**
+ *	\x83t\x83@\x83C\x83\x8B\x96\xBC\x82\xF0\x83\x8D\x83O\x95ۑ\xB6\x83t\x83H\x83\x8B\x83_\x82\xA9\x82\xE7\x82̑\x8A\x91΃p\x83X\x82Ƃ݂Ȃ\xB5\x81A\x83t\x83\x8B\x83p\x83X\x82ɕϊ\xB7\x82\xB7\x82\xE9
+ *		%LOCALAPPDATA%\teraterm5 (%USERPROFILE%\AppData\Local\teraterm5)
+ *	@return	\x83t\x83\x8B\x83p\x83X\x83t\x83@\x83C\x83\x8B\x96\xBC
+ *			free()\x82\xB7\x82邱\x82\xC6
+ */
+wchar_t *get_log_dir_relative_nameW(const wchar_t *basename)
+{
+	wchar_t *path;
+
+	if (!IsRelativePathW(basename)) {
+		return _wcsdup(basename);
+	}
+
+	path = GetLogDirW();
+	awcscats(&path, L"\\", basename, NULL);
+	return path;
+}
+
 static void complete_setup_dlg(PTInstVar pvar, HWND dlg)
 {
 	char buf[4096];

Modified: trunk/ttssh2/ttxssh/ttxssh.h
===================================================================
--- trunk/ttssh2/ttxssh/ttxssh.h	2022-01-28 16:36:06 UTC (rev 9706)
+++ trunk/ttssh2/ttxssh/ttxssh.h	2022-01-28 23:49:12 UTC (rev 9707)
@@ -387,6 +387,7 @@
 wchar_t *get_teraterm_dir_relative_nameW(const wchar_t *basename);
 int copy_teraterm_dir_relative_path(char *dest, int destsize, char *basename);
 wchar_t *get_home_dir_relative_nameW(const wchar_t *basename);
+wchar_t *get_log_dir_relative_nameW(const wchar_t *basename);
 int uuencode(unsigned char *src, int srclen, unsigned char *target, int targsize);
 
 #endif


ttssh2-commit メーリングリストの案内
Back to archive index