From f767a82fd307527417188f07efa0b0a7e2655566 Mon Sep 17 00:00:00 2001 From: Fumitoshi UKAI Date: Mon, 4 Feb 2002 14:49:21 +0000 Subject: [w3m-dev 02985] inputAnswer() and no "ssl_forbid_method" * file.c (inputAnswer): buf size is 80 * url.c (openSSLHandle): if old_ssl_forbid_method == ssl_forbid_method ssl path is not modified From: Fumitoshi UKAI --- ChangeLog | 9 ++++++++- file.c | 6 +++--- url.c | 7 ++++--- 3 files changed, 15 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index c06f498..64baaed 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2002-02-04 Fumitoshi UKAI + + * [w3m-dev 02985] inputAnswer() and no "ssl_forbid_method" + * file.c (inputAnswer): buf size is 80 + * url.c (openSSLHandle): if old_ssl_forbid_method == ssl_forbid_method + ssl path is not modified + 2002-02-04 Fumitoshi UKAI * [w3m-dev 02980] Re: code_to_str not found ifndef JP_CHARSET @@ -2755,4 +2762,4 @@ * release-0-2-1 * import w3m-0.2.1 -$Id: ChangeLog,v 1.296 2002/02/03 15:25:45 ukai Exp $ +$Id: ChangeLog,v 1.297 2002/02/04 14:49:21 ukai Exp $ diff --git a/file.c b/file.c index 34959f7..f2f10bc 100644 --- a/file.c +++ b/file.c @@ -1,4 +1,4 @@ -/* $Id: file.c,v 1.60 2002/02/03 15:22:24 ukai Exp $ */ +/* $Id: file.c,v 1.61 2002/02/04 14:49:21 ukai Exp $ */ #include "fm.h" #include #include "myctype.h" @@ -6982,7 +6982,7 @@ char * inputAnswer(char *prompt) { char *ans; - char buf[2]; + char buf[80]; if (fmInitialized) { term_raw(); @@ -6991,7 +6991,7 @@ inputAnswer(char *prompt) else { printf(prompt); fflush(stdout); - fgets(buf, 2, stdin); + fgets(buf, 80, stdin); ans = allocStr(buf, 1); } return ans; diff --git a/url.c b/url.c index d747854..c8bd922 100644 --- a/url.c +++ b/url.c @@ -1,4 +1,4 @@ -/* $Id: url.c,v 1.40 2002/02/01 13:58:47 inu Exp $ */ +/* $Id: url.c,v 1.41 2002/02/04 14:49:21 ukai Exp $ */ #include #include "config.h" #include "fm.h" @@ -286,8 +286,9 @@ openSSLHandle(int sock, char *hostname) static int old_ssl_verify_server = -1; #endif - if (!old_ssl_forbid_method || !ssl_forbid_method || - strcmp(old_ssl_forbid_method, ssl_forbid_method)) { + if (old_ssl_forbid_method != ssl_forbid_method + && (!old_ssl_forbid_method || !ssl_forbid_method || + strcmp(old_ssl_forbid_method, ssl_forbid_method))) { old_ssl_forbid_method = ssl_forbid_method; #ifdef USE_SSL_VERIFY ssl_path_modified = 1; -- cgit v1.2.3