Diff of /branches/ssh_chacha20poly1305/ttssh2/ttxssh/ttxssh.c

OSDN > Find Software > Tera Term

 Browse Subversion Repository



/[ttssh2]/branches/ssh_chacha20poly1305/ttssh2/ttxssh/ttxssh.c




Diff of /branches/ssh_chacha20poly1305/ttssh2/ttxssh/ttxssh.c



 Parent Directory

|  Revision Log



|  Patch














revision 5959 by doda,
Tue Aug 25 09:17:18 2015 UTC




revision 5960 by maya,
Tue Aug 25 21:19:13 2015 UTC






#

Line 363 
 static void read_ssh_options(PTInstVar p


Line 363 
 static void read_ssh_options(PTInstVar p












363
 {
 {

















364
         char buf[1024];
         char buf[1024];

















365
         TS_SSH FAR *settings = pvar->ts_SSH;
         TS_SSH FAR *settings = pvar->ts_SSH;














         size_t i;
 













366
 
 

















367
 #define READ_STD_STRING_OPTION(name) \
 #define READ_STD_STRING_OPTION(name) \

















368
         read_string_option(fileName, #name, "", settings->name, sizeof(settings->name))
         read_string_option(fileName, #name, "", settings->name, sizeof(settings->name))











#

Line 379 
 static void read_ssh_options(PTInstVar p


Line 378 
 static void read_ssh_options(PTInstVar p












378
         }
         }

















379
 
 

















380
         READ_STD_STRING_OPTION(DefaultUserName);
         READ_STD_STRING_OPTION(DefaultUserName);














 
 













381
         READ_STD_STRING_OPTION(DefaultForwarding);
         READ_STD_STRING_OPTION(DefaultForwarding);














         // 内部では ; で区切っているので、, を ; に変換する
 










         for (i=0; i<strlen(settings->DefaultForwarding); i++) {
 










                 if (settings->DefaultForwarding[i] == ',') {
 










                         settings->DefaultForwarding[i] = ';';
 










                 }
 










         }
 










 
 













382
         READ_STD_STRING_OPTION(DefaultRhostsLocalUserName);
         READ_STD_STRING_OPTION(DefaultRhostsLocalUserName);

















383
         READ_STD_STRING_OPTION(DefaultRhostsHostPrivateKeyFile);
         READ_STD_STRING_OPTION(DefaultRhostsHostPrivateKeyFile);

















384
         READ_STD_STRING_OPTION(DefaultRSAPrivateKeyFile);
         READ_STD_STRING_OPTION(DefaultRSAPrivateKeyFile);











#

Line 506 
 static void write_ssh_options(PTInstVar


Line 497 
 static void write_ssh_options(PTInstVar












497
                                   settings->DefaultUserName, fileName);
                                   settings->DefaultUserName, fileName);

















498
 
 

















499
         if (copy_forward) {
         if (copy_forward) {














                 char DefaultForwarding[2048];
 










                 size_t i;
 










                 strncpy_s(DefaultForwarding, sizeof(DefaultForwarding), settings->DefaultForwarding, _TRUNCATE);
 










                 // 内部では ; で区切っているので、; を , に変換する
 










                 for (i=0; i<strlen(DefaultForwarding); i++) {
 










                         if (DefaultForwarding[i] == ';') {
 










                                 DefaultForwarding[i] = ',';
 










                         }
 










                 }
 













500
                 WritePrivateProfileString("TTSSH", "DefaultForwarding",
                 WritePrivateProfileString("TTSSH", "DefaultForwarding",















501


                                           DefaultForwarding, fileName);


                                           settings->DefaultForwarding, fileName);















502
         }
         }

















503
 
 

















504
         WritePrivateProfileString("TTSSH", "CipherOrder",
         WritePrivateProfileString("TTSSH", "CipherOrder",





























Legend:



Removed from v.5959
 


changed lines


 
Added in v.5960













Back to OSDN">Back to OSDN
ViewVC Help


Powered by ViewVC 1.1.26
 /[ttssh2]/branches/ssh_chacha20poly1305/ttssh2/ttxssh/ttxssh.c
-revision 5959 by doda,
Tue Aug 25 09:17:18 2015 UTC
+revision 5960 by maya,
Tue Aug 25 21:19:13 2015 UTC
 Line 363 
 static void read_ssh_options(PTInstVar p
  {
          char buf[1024];
          TS_SSH FAR *settings = pvar->ts_SSH;
-         size_t i;
  #define READ_STD_STRING_OPTION(name) \
          read_string_option(fileName, #name, "", settings->name, sizeof(settings->name))
-Line 379 
 static void read_ssh_options(PTInstVar p
+Line 378 
 static void read_ssh_options(PTInstVar p
          }
          READ_STD_STRING_OPTION(DefaultUserName);
          READ_STD_STRING_OPTION(DefaultForwarding);
-         // 内部では ; で区切っているので、, を ; に変換する
-         for (i=0; i<strlen(settings->DefaultForwarding); i++) {
-                 if (settings->DefaultForwarding[i] == ',') {
-                         settings->DefaultForwarding[i] = ';';
-                 }
-         }
          READ_STD_STRING_OPTION(DefaultRhostsLocalUserName);
          READ_STD_STRING_OPTION(DefaultRhostsHostPrivateKeyFile);
          READ_STD_STRING_OPTION(DefaultRSAPrivateKeyFile);
-Line 506 
 static void write_ssh_options(PTInstVar
+Line 497 
 static void write_ssh_options(PTInstVar
                                    settings->DefaultUserName, fileName);
          if (copy_forward) {
-                 char DefaultForwarding[2048];
-                 size_t i;
-                 strncpy_s(DefaultForwarding, sizeof(DefaultForwarding), settings->DefaultForwarding, _TRUNCATE);
-                 // 内部では ; で区切っているので、; を , に変換する
-                 for (i=0; i<strlen(DefaultForwarding); i++) {
-                         if (DefaultForwarding[i] == ';') {
-                                 DefaultForwarding[i] = ',';
-                         }
-                 }
                  WritePrivateProfileString("TTSSH", "DefaultForwarding",
-                                           DefaultForwarding, fileName);
+                                           settings->DefaultForwarding, fileName);
          }
          WritePrivateProfileString("TTSSH", "CipherOrder",
 Legend:



Removed from v.5959
 


changed lines


 
Added in v.5960
 Legend:



Removed from v.5959
 


changed lines


 
Added in v.5960
-Removed from v.5959
+Added in v.5960
-Back to OSDN">Back to OSDN
+ViewVC Help
 Powered by ViewVC 1.1.26

Develop and Download Open Source Software

Tera Term

Browse Subversion Repository