From b2632ef83f47f7f5dc89949c33b7487a1ecaef96 Mon Sep 17 00:00:00 2001 From: cyd01 Date: Wed, 18 Dec 2019 13:28:39 +0100 Subject: [PATCH] Tagging the 0.73.1.3 release of the kitty project. --- 0.73_My_PuTTY/settings.c | 2 ++ 0.73_My_PuTTY/version.h | 2 +- 0.73_My_PuTTY/windows/version_minor.txt | 2 +- 0.73_My_PuTTY/windows/windlg.c | 1 - 0.73_My_PuTTY/windows/window.c | 5 ++-- kitty_savedump.c | 40 ++++++++++++------------- kitty_store.c | 19 ++++++++++-- 7 files changed, 44 insertions(+), 27 deletions(-) diff --git a/0.73_My_PuTTY/settings.c b/0.73_My_PuTTY/settings.c index 24bd588..0559b33 100644 --- a/0.73_My_PuTTY/settings.c +++ b/0.73_My_PuTTY/settings.c @@ -953,6 +953,7 @@ void load_open_settings(settings_r *sesskey, Conf *conf) { int i; char *prot; + #ifdef MOD_PERSO /* * HACK: PuTTY-url @@ -1167,6 +1168,7 @@ void load_open_settings(settings_r *sesskey, Conf *conf) else if (sshprot == 2) sshprot = 3; /* => "SSH-2 only" */ conf_set_int(conf, CONF_sshprot, sshprot); } + gpps(sesskey, "LogHost", "", conf, CONF_loghost); gppb(sesskey, "SSH2DES", false, conf, CONF_ssh2_des_cbc); gppb(sesskey, "SshNoAuth", false, conf, CONF_ssh_no_userauth); diff --git a/0.73_My_PuTTY/version.h b/0.73_My_PuTTY/version.h index 8b93505..31633a3 100644 --- a/0.73_My_PuTTY/version.h +++ b/0.73_My_PuTTY/version.h @@ -1,5 +1,5 @@ #define RELEASE 0.73 #define TEXTVER "Release 0.73" #define SSHVER "-Release-0.73" -#define BINARY_VERSION 0,73,1,2 +#define BINARY_VERSION 0,73,1,3 #define SOURCE_COMMIT "unavailable" diff --git a/0.73_My_PuTTY/windows/version_minor.txt b/0.73_My_PuTTY/windows/version_minor.txt index 0cfbf08..00750ed 100644 --- a/0.73_My_PuTTY/windows/version_minor.txt +++ b/0.73_My_PuTTY/windows/version_minor.txt @@ -1 +1 @@ -2 +3 diff --git a/0.73_My_PuTTY/windows/windlg.c b/0.73_My_PuTTY/windows/windlg.c index 1facc30..6bc0b05 100644 --- a/0.73_My_PuTTY/windows/windlg.c +++ b/0.73_My_PuTTY/windows/windlg.c @@ -1003,7 +1003,6 @@ void defuse_showwindow(void) bool do_config(void) { bool ret; - #ifdef MOD_PERSO // On cree la session "Default Settings" si elle n'existe pas if( GetDefaultSettingsFlag() ) { diff --git a/0.73_My_PuTTY/windows/window.c b/0.73_My_PuTTY/windows/window.c index 59f2145..681b3fc 100644 --- a/0.73_My_PuTTY/windows/window.c +++ b/0.73_My_PuTTY/windows/window.c @@ -745,7 +745,7 @@ int WINAPI WinMain(HINSTANCE inst, HINSTANCE prev, LPSTR cmdline, int show) } conf_set_int(conf, CONF_logtype, LGTYP_NONE); do_defaults(NULL, conf); - + p = cmdline; /* * Process a couple of command-line options which are more @@ -1160,7 +1160,6 @@ int WINAPI WinMain(HINSTANCE inst, HINSTANCE prev, LPSTR cmdline, int show) } } } - #ifdef MOD_PERSO // Creation du fichier kitty.ini par defaut si besoin CreateDefaultIniFile() ; @@ -1172,8 +1171,10 @@ int WINAPI WinMain(HINSTANCE inst, HINSTANCE prev, LPSTR cmdline, int show) * (explicitly) specified a launchable configuration. */ if (!(special_launchable_argument || cmdline_host_ok(conf))) { + if (!do_config()) cleanup_exit(0); + } prepare_session(conf); diff --git a/kitty_savedump.c b/kitty_savedump.c index e404aab..6dfc8ff 100644 --- a/kitty_savedump.c +++ b/kitty_savedump.c @@ -757,13 +757,13 @@ void SaveDumpFile( char * filename ) { if( ( fpout = fopen( buffer, "w" ) ) != NULL ) { - fputs( "\n@ InitialDirectoryListing @\n\n", fpout ) ; + fputs( "\n@@@ InitialDirectoryListing @@@\n\n", fpout ) ; SaveDumpListFile( fpout, InitialDirectory ) ; fflush( fpout ) ; - fputs( "\n@ Environment variables @\n\n", fpout ) ; + fputs( "\n@@@ Environment variables @@@\n\n", fpout ) ; SaveDumpEnvironment( fpout ) ; fflush( fpout ) ; - fputs( "\n@ KiTTYIniFile @\n\n", fpout ) ; + fputs( "\n@@@ KiTTYIniFile @@@\n\n", fpout ) ; if( ( fp = fopen( KittyIniFile, "r" ) ) != NULL ) { while( fgets( buffer, 4095, fp ) != NULL ) fputs( buffer, fpout ) ; fclose( fp ) ; @@ -772,7 +772,7 @@ void SaveDumpFile( char * filename ) { fflush( fpout ) ; if( RegTestKey( HKEY_CURRENT_USER, TEXT("Software\\SimonTatham\\PuTTY") ) ) { - fputs( "\n@ PuTTY RegistryBackup @\n\n", fpout ) ; + fputs( "\n@@@ PuTTY RegistryBackup @@@\n\n", fpout ) ; SaveRegistryKeyEx( HKEY_CURRENT_USER, TEXT("Software\\SimonTatham\\PuTTY"), KittySavFile ) ; if( ( fp = fopen( KittySavFile, "r" ) ) != NULL ) { while( fgets( buffer, 4095, fp ) != NULL ) fputs( buffer, fpout ) ; @@ -782,7 +782,7 @@ void SaveDumpFile( char * filename ) { } fflush( fpout ) ; - fputs( "\n@ KiTTY RegistryBackup @\n\n", fpout ) ; + fputs( "\n@@@ KiTTY RegistryBackup @@@\n\n", fpout ) ; if( (IniFileFlag == SAVEMODE_REG)||(IniFileFlag == SAVEMODE_FILE) ) { SaveRegistryKey() ; if( ( fp = fopen( KittySavFile, "r" ) ) != NULL ) { @@ -800,65 +800,65 @@ void SaveDumpFile( char * filename ) { } fflush( fpout ) ; - fputs( "\n@ WindowSettings @\n\n", fpout ) ; + fputs( "\n@@@ WindowSettings @@@\n\n", fpout ) ; PrintWindowSettings( fpout ) ; - fputs( "\n@ RunningProcess @\n\n", fpout ) ; + fputs( "\n@@@ RunningProcess @@@\n\n", fpout ) ; PrintAllProcess( fpout ) ; fflush( fpout ) ; - fputs( "\n@ CurrentEventLog @\n\n", fpout ) ; + fputs( "\n@@@ CurrentEventLog @@@\n\n", fpout ) ; i = 0 ; while( print_event_log( fpout, i ) ) { i++ ; } fflush( fpout ) ; - fputs( "\n@ ClipBoardContent @\n\n", fpout ) ; + fputs( "\n@@@ ClipBoardContent @@@\n\n", fpout ) ; SaveDumpClipBoard( fpout ) ; fflush( fpout ) ; if( debug_flag ) { - fputs( "\n@ KeyPressed @\n\n", fpout ) ; + fputs( "\n@@@ KeyPressed @@@\n\n", fpout ) ; fprintf( fpout, "%d: WM_KEYDOWN\n%d: WM_SYSKEYDOWN\n%d: WM_KEYUP\n%d: WM_SYSKEYUP\n%d: WM_CHAR\n\n", WM_KEYDOWN,WM_SYSKEYDOWN,WM_KEYUP,WM_SYSKEYUP,WM_CHAR); fprintf( fpout, "SHIFT CONTROL ALT ALTGR WIN\n" ) ; fprintf( fpout, "%s\n", SaveKeyPressed ) ; } fflush( fpout ) ; - fputs( "\n@ RunningConfig @\n\n", fpout ) ; fflush( fpout ) ; + fputs( "\n@@@ RunningConfig @@@\n\n", fpout ) ; fflush( fpout ) ; SaveDumpConfig( fpout, conf ) ; fflush( fpout ) ; - fputs( "\n@ RunningConfig in KTX file format @\n\n", fpout ) ; fflush( fpout ) ; + fputs( "\n@@@ RunningConfig in KTX file format @@@\n\n", fpout ) ; fflush( fpout ) ; SaveCurrentConfig( fpout, conf ) ; fputs( "\n", fpout ) ; fflush( fpout ) ; if( IniFileFlag==SAVEMODE_DIR ) { - fputs( "\n@ RunningPortableConfig @\n\n", fpout ) ; + fputs( "\n@@@ RunningPortableConfig @@@\n\n", fpout ) ; SaveDumpPortableConfig( fpout ) ; } fflush( fpout ) ; if( DebugText!= NULL ) { - fputs( "\n@ Debug @\n\n", fpout ) ; + fputs( "\n@@@ Debug @@@\n\n", fpout ) ; fprintf( fpout, "%s\n", DebugText ) ; } - fputs( "\n@ Shortcuts @\n\n", fpout ) ; + fputs( "\n@@@ Shortcuts @@@\n\n", fpout ) ; SaveShortCuts( fpout ) ; fflush( fpout ) ; - fputs( "\n@ SpecialMenu @\n\n", fpout ) ; + fputs( "\n@@@ SpecialMenu @@@\n\n", fpout ) ; SaveSpecialMenu( fpout ) ; fflush( fpout ) ; if( existfile("kitty.log") ) { - fputs( "\n@ Debug log file @\n\n", fpout ) ; + fputs( "\n@@@ Debug log file @@@\n\n", fpout ) ; SaveDebugFile( "kitty.log", fpout ) ; } if( existfile( conf_get_filename(conf,CONF_keyfile)->path ) ) { - fputs( "\n@ Private key file @\n\n", fpout ) ; + fputs( "\n@@@ Private key file @@@\n\n", fpout ) ; SaveDebugFile( conf_get_filename(conf,CONF_keyfile)->path, fpout ) ; } #ifdef MOD_RUTTY if( existfile( conf_get_filename(conf,CONF_script_filename)->path ) ) { - fputs( "\n@ RuTTY script file @\n\n", fpout ) ; + fputs( "\n@@@ RuTTY script file @@@\n\n", fpout ) ; SaveDebugFile( conf_get_filename(conf,CONF_script_filename)->path, fpout ) ; } #endif - fputs( "\n@ ScreenShot @\n\n", fpout ) ; + fputs( "\n@@@ ScreenShot @@@\n\n", fpout ) ; SaveScreenShot( fpout ) ; fflush( fpout ) ; fclose( fpout ) ; diff --git a/kitty_store.c b/kitty_store.c index c0677a2..530ab3b 100644 --- a/kitty_store.c +++ b/kitty_store.c @@ -583,16 +583,28 @@ void SettingsLoad( HSettingsList list, const char * filename ) { char buffer[4096] ; int p ; +//debug_log("filename=%s|\n",filename); int i=0; + if( (fp=fopen(filename,"rb")) != NULL ) { list->filename = (char*) malloc( strlen(filename)+1 ) ; strcpy( list->filename, filename ) ; - while( fgets(buffer,4096,fp) != NULL ) { + while( fgets(buffer,409,fp) != NULL ) { +//debug_log("\nline %05d[%d]: %s|\n",++i,strlen(buffer),buffer); char *name, *value, *value2 ; - while( buffer[strlen(buffer)-2]!='\\' ) { + while( (buffer[strlen(buffer)-1]=='\n') || (buffer[strlen(buffer)-1]=='\r') ) buffer[strlen(buffer)-1] = '\0' ; +//debug_log("line %05d[%d]: %s|\n",i,strlen(buffer),buffer); +//debug_log("\t-2=%c -3=%c\n",buffer[strlen(buffer)-2],buffer[strlen(buffer)-3]); + while( buffer[strlen(buffer)-1]!='\\' ) { +//debug_log("ici\n"); while( buffer[strlen(buffer)-1]=='\r' ) { buffer[strlen(buffer)+1]='\0' ; buffer[strlen(buffer)-1]='\\' ; buffer[strlen(buffer)] = 'r' ; } while( buffer[strlen(buffer)-1]=='\n' ) { buffer[strlen(buffer)+1]='\0' ; buffer[strlen(buffer)-1]='\\' ; buffer[strlen(buffer)] = 'n' ; } if( fgets( buffer+strlen(buffer), 4096, fp ) == NULL ) break ; + while( (buffer[strlen(buffer)-1]=='\n') || (buffer[strlen(buffer)-1]=='\r') ) buffer[strlen(buffer)-1] = '\0' ; } +//debug_log("line %05d[%d]: %s|\n",i,strlen(buffer),buffer); while( (buffer[strlen(buffer)-1]=='\n') || (buffer[strlen(buffer)-1]=='\r') ) buffer[strlen(buffer)-1] = '\0' ; +//debug_log("line %05d[%d]: %s|\n",i,strlen(buffer),buffer); + if( buffer[strlen(buffer)-1] != '\\' ) { strcat( buffer, "\\" ) ; } +//debug_log("line %05d[%d]: %s|\n",i,strlen(buffer),buffer); p = poss( "\\", buffer ) ; if( p>1 ) { name = (char*) malloc( p+1 ) ; @@ -600,13 +612,16 @@ void SettingsLoad( HSettingsList list, const char * filename ) { value = (char*) malloc( strlen(buffer)-p+1 ) ; strcpy( value, buffer+p ) ; value[strlen(value)-1]='\0' ; +//debug_log("line %05d: %s|%s|\n",i,name,value); value2 = (char*) malloc( strlen(value)+1 ) ; unmungestr( value, value2, strlen(value)+1 ) ; +//debug_log("line %05d: %s|%s|%s|\n",i,name,value,value2); SettingsAddItem( list, name, value2 ) ; free( value2 ) ; free( value ) ; free( name ) ; } + } fclose(fp ); } else {