to consult cfg.logxfovr, because it gets done once in logging.c.
askappend() is now called only when a question _really_ needs to be
asked of the user. Also in this checkin, cleanup_exit() in console.c
no longer consults cfg.protocol to decide whether to save the random
seed, because random_save_seed() can make that decision for itself
and do it better.
git-svn-id: http://svn.tartarus.org/sgt/putty@2552
cda61777-01e9-0310-a592-
d414129be87e
sk_cleanup();
WSACleanup();
- if (cfg.protocol == PROT_SSH) {
- random_save_seed();
+ random_save_seed();
#ifdef MSCRYPTOAPI
- crypto_wrapup();
+ crypto_wrapup();
#endif
- }
exit(code);
}
char line[32];
- if (cfg.logxfovr != LGXF_ASK) {
- return ((cfg.logxfovr == LGXF_OVR) ? 2 : 1);
- }
if (console_batch_mode) {
fprintf(stderr, msgtemplate_batch, FILENAME_MAX, filename);
fflush(stderr);
if (ctx->lgfp) {
int i;
fclose(ctx->lgfp);
- i = askappend(ctx->frontend, ctx->currlogfilename);
+ if (cfg.logxfovr != LGXF_ASK) {
+ i = ((cfg.logxfovr == LGXF_OVR) ? 2 : 1);
+ } else
+ i = askappend(ctx->frontend, ctx->currlogfilename);
if (i == 1)
writemod[0] = 'a'; /* set append mode */
else if (i == 0) { /* cancelled */
char line[32];
- if (cfg.logxfovr != LGXF_ASK) {
- return ((cfg.logxfovr == LGXF_OVR) ? 2 : 1);
- }
if (console_batch_mode) {
fprintf(stderr, msgtemplate_batch, FILENAME_MAX, filename);
fflush(stderr);
"or Cancel to disable logging.";
char message[sizeof(msgtemplate) + FILENAME_MAX];
int mbret;
- if (cfg.logxfovr != LGXF_ASK) {
- return ((cfg.logxfovr == LGXF_OVR) ? 2 : 1);
- }
+
sprintf(message, msgtemplate, FILENAME_MAX, filename);
mbret = MessageBox(NULL, message, mbtitle,