svnno****@sourc*****
svnno****@sourc*****
2009年 4月 13日 (月) 18:49:35 JST
Tera TermRevision: 3307
http://svn.sourceforge.jp/view?root=ttssh2&view=rev&rev=3307
Author: doda
Date: 2009-04-13 18:49:34 +0900 (Mon, 13 Apr 2009)
Log Message:
-----------
一部ã®ã‚ªãƒ—ションをクリアã—ã¦ã„ãªã‹ã£ãŸã®ã‚’ä¿®æ£ã€‚
Modified Paths:
--------------
trunk/ttssh2/ttxssh/ttxssh.c
-------------- next part --------------
Modified: trunk/ttssh2/ttxssh/ttxssh.c
===================================================================
--- trunk/ttssh2/ttxssh/ttxssh.c 2009-04-12 12:45:43 UTC (rev 3306)
+++ trunk/ttssh2/ttxssh/ttxssh.c 2009-04-13 09:49:34 UTC (rev 3307)
@@ -1540,20 +1540,20 @@
MessageBox(NULL, buf, "TTSSH", MB_OK | MB_ICONEXCLAMATION);
}
- return OPTION_CLEAR;
-
// ttermpro.exe ‚Ì /T= Žw’è‚Ì—¬—p‚È‚Ì‚ÅA‘啶Žš‚à‹–‚· (2006.10.19 maya)
} else if (MATCH_STR_I(option + 1, "t=") == 0) {
if (strcmp(option + 3, "2") == 0) {
pvar->settings.Enabled = 1;
- return OPTION_CLEAR;
+ return OPTION_CLEAR; // /t=2‚Íttssh‘¤‚Å‚ÌŠg’£‚È‚Ì‚ÅÁ‚·
} else {
pvar->settings.Enabled = 0;
+ return OPTION_NONE; // Tera Term‘¤‚ʼnðŽß‚·‚é‚Ì‚ÅÁ‚³‚È‚¢
}
// ttermpro.exe ‚Ì /F= Žw’è‚Å‚à TTSSH ‚ÌÝ’è‚ð“Ç‚Þ (2006.10.11 maya)
} else if (MATCH_STR_I(option + 1, "f=") == 0) {
read_ssh_options_from_user_file(pvar, option + 3);
+ return OPTION_NONE; // Tera Term‘¤‚Å‚à‰ðŽß‚·‚é•K—v‚ª‚ ‚é‚Ì‚ÅÁ‚³‚È‚¢
// /1 ‚¨‚æ‚Ñ /2 ƒIƒvƒVƒ‡ƒ“‚ÌV‹K’ljÁ (2004.10.3 yutaka)
} else if (MATCH_STR(option + 1, "1") == 0) {
@@ -1627,12 +1627,16 @@
pvar->ask4passwd = 1;
}
+ else { // Other (not ttssh) option
+ return OPTION_NONE; // ttssh‚̃IƒvƒVƒ‡ƒ“‚Å‚Í‚È‚¢‚Ì‚ÅÁ‚³‚È‚¢
+ }
// ƒpƒXƒ[ƒh‚𕷂ꇂ͎©“®ƒƒOƒCƒ“‚ª–³Œø‚É‚È‚é
// /auth ‚Í”F؃ƒ\ƒbƒh‚ÌŽw’è‚Æ‚µ‚Ä‚Í—˜—p‚³‚ê‚é (2006.9.18 maya)
if (pvar->ask4passwd == 1) {
pvar->ssh2_autologin = 0;
}
+ return OPTION_CLEAR;
}
else if ((MATCH_STR_I(option, "ssh://") == 0) ||