about summary refs log tree commit diff stats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--CHANGES6
-rw-r--r--WWW/Library/Implementation/HTGopher.c14
-rw-r--r--WWW/Library/Implementation/HTMIME.c4
-rw-r--r--WWW/Library/Implementation/HTTP.c9
-rw-r--r--lynx.cfg4
-rw-r--r--src/GridText.c3
-rw-r--r--src/LYHistory.c4
-rw-r--r--src/LYOptions.c10
-rw-r--r--src/LYStrings.c10
-rw-r--r--src/tidy_tls.c4
10 files changed, 35 insertions, 33 deletions
diff --git a/CHANGES b/CHANGES
index b93b64da..322d6acc 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,9 +1,9 @@
--- $LynxId: CHANGES,v 1.828 2015/12/15 01:42:54 tom Exp $
+-- $LynxId: CHANGES,v 1.830 2015/12/16 01:24:04 tom Exp $
 ===============================================================================
 Changes since Lynx 2.8 release
 ===============================================================================
 
-2015-12-14 (2.8.9dev.7)
+2015-12-15 (2.8.9dev.7)
 * fix a potential null dereference in tidy_tls.c reported by Coverity -TD
 * extend advanced mode by showing field names in forms in the status line
   (suggested by TG) -TD
@@ -187,7 +187,7 @@ Changes since Lynx 2.8 release
 
 2014-02-04 (2.8.8pre.4)
 * modify the LOCALE_CHARSET feature to provide a default value for the
-  ASSUMED_CHARSET feature aka "display-charset" (Debian #737416) -TD
+  ASSUME_CHARSET feature aka "display-charset" (Debian #737416) -TD
 * fix two bugs in print-to-file from 2.8.8dev.10 changes -TD
   + suggested filename suffix for text/html was ".html" rather than ".txt"
   + using ^U to clear the filename to print to did not cancel the prompt
diff --git a/WWW/Library/Implementation/HTGopher.c b/WWW/Library/Implementation/HTGopher.c
index 665006a4..30577a9d 100644
--- a/WWW/Library/Implementation/HTGopher.c
+++ b/WWW/Library/Implementation/HTGopher.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: HTGopher.c,v 1.61 2013/11/28 11:12:32 tom Exp $
+ * $LynxId: HTGopher.c,v 1.62 2015/12/16 01:17:53 tom Exp $
  *
  *			GOPHER ACCESS				HTGopher.c
  *			=============
@@ -1227,7 +1227,7 @@ static int generate_cso_report(HTStream *Target)
     char line[BIG];
     char *buf = 0;
     char *p = line, *href = NULL;
-    int len, i, prev_ndx, ndx;
+    int i, prev_ndx, ndx;
     char *rcode, *ndx_str, *fname, *fvalue, *l;
     CSOfield_info *fld;
     BOOL stop = FALSE;
@@ -1263,16 +1263,14 @@ static int generate_cso_report(HTStream *Target)
 	    }
 	    rcode = (p[0] == '-') ? &p[1] : p;
 	    ndx_str = fname = NULL;
-	    len = (int) strlen(p);
-	    for (i = 0; i < len; i++) {
+	    for (i = 0; p[i] != '\0'; i++) {
 		if (p[i] == ':') {
 		    p[i] = '\0';
-		    if (!ndx_str) {
-			fname = ndx_str = &p[i + 1];
-		    } else {
-			fname = &p[i + 1];
+		    fname = &p[i + 1];
+		    if (ndx_str) {
 			break;
 		    }
+		    ndx_str = fname;
 		}
 	    }
 	    if (ndx_str) {
diff --git a/WWW/Library/Implementation/HTMIME.c b/WWW/Library/Implementation/HTMIME.c
index 94dd7fbf..6f6391c8 100644
--- a/WWW/Library/Implementation/HTMIME.c
+++ b/WWW/Library/Implementation/HTMIME.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: HTMIME.c,v 1.89 2014/07/24 22:08:24 tom Exp $
+ * $LynxId: HTMIME.c,v 1.90 2015/12/16 01:13:50 tom Exp $
  *
  *			MIME Message Parse			HTMIME.c
  *			==================
@@ -2449,7 +2449,7 @@ void HTmmdecode(char **target,
 		HTmmdec_base64(&m2buf, mmbuf);
 	    else
 		HTmmdec_quote(&m2buf, mmbuf);
-	    for (t = m2buf; *t;)
+	    for (t = m2buf; non_empty(t);)
 		*u++ = *t++;
 	    HTmmcont = 1;
 	} else {
diff --git a/WWW/Library/Implementation/HTTP.c b/WWW/Library/Implementation/HTTP.c
index 57263f44..30edc891 100644
--- a/WWW/Library/Implementation/HTTP.c
+++ b/WWW/Library/Implementation/HTTP.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: HTTP.c,v 1.147 2015/11/17 01:29:09 tom Exp $
+ * $LynxId: HTTP.c,v 1.148 2015/12/16 01:54:03 tom Exp $
  *
  * HyperText Tranfer Protocol	- Client implementation		HTTP.c
  * ==========================
@@ -877,9 +877,10 @@ static int HTLoadHTTP(const char *arg,
 				  gettext("GnuTLS error when trying to verify certificate."));
 	    } else {
 		type = gnutls_certificate_type_get(handle->gnutls_state);
-		ret = gnutls_certificate_verification_status_print(tls_status,
-								   type, &out, 0);
-		SSL_single_prompt(&msg, out.data);
+		(void) gnutls_certificate_verification_status_print(tls_status,
+								    type,
+								    &out, 0);
+		SSL_single_prompt(&msg, (const char *) out.data);
 		gnutls_free(out.data);
 	    }
 #else
diff --git a/lynx.cfg b/lynx.cfg
index 170a6f1d..4e4fb8e3 100644
--- a/lynx.cfg
+++ b/lynx.cfg
@@ -1,4 +1,4 @@
-# $LynxId: lynx.cfg,v 1.262 2015/10/10 00:26:07 tom Exp $
+# $LynxId: lynx.cfg,v 1.263 2015/12/15 09:35:48 tom Exp $
 # lynx.cfg file.
 # The default placement for this file is /usr/local/lib/lynx.cfg (Unix)
 #                                     or Lynx_Dir:lynx.cfg (VMS)
@@ -442,7 +442,7 @@ DEFAULT_INDEX_FILE:http://scout.wisc.edu/
 # LOCALE_CHARSET overrides CHARACTER_SET if true, using the current locale to
 # lookup a MIME name that corresponds, and use that as the display charset.
 #
-# It also modifies the default value for ASSUMED_CHARSET; it does not override
+# It also modifies the default value for ASSUME_CHARSET; it does not override
 # that setting.
 #
 # Note that while nl_langinfo(CODESET) itself is standardized, the return
diff --git a/src/GridText.c b/src/GridText.c
index b05aaf2f..810a38d2 100644
--- a/src/GridText.c
+++ b/src/GridText.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: GridText.c,v 1.286 2014/12/16 01:23:52 tom Exp $
+ * $LynxId: GridText.c,v 1.287 2015/12/16 01:20:01 tom Exp $
  *
  *		Character grid hypertext object
  *		===============================
@@ -8226,7 +8226,6 @@ void print_wwwfile_to_fd(FILE *fp,
 
 		if (off2 >= 0 && off2 < cur->length) {
 		    temp_ptr = &(cur->value[off2]);
-		    temp_len = 1;
 		    try_utf8 = temp_ptr;
 		    temp_chr = (int) UCGetUniFromUtf8String(&try_utf8);
 		    if (temp_chr > 127) {
diff --git a/src/LYHistory.c b/src/LYHistory.c
index 016fe7be..3f13bbd6 100644
--- a/src/LYHistory.c
+++ b/src/LYHistory.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: LYHistory.c,v 1.86 2013/10/19 00:46:43 tom Exp $
+ * $LynxId: LYHistory.c,v 1.87 2015/12/16 01:45:14 tom Exp $
  */
 #include <HTUtils.h>
 #include <HTTP.h>
@@ -627,7 +627,7 @@ int LYhist_next(DocInfo *doc, DocInfo *newdoc)
 void LYpop_num(int number,
 	       DocInfo *doc)
 {
-    if (number >= 0 && nhist + nhist_extra > number) {
+    if (number >= 0 && (nhist + nhist_extra) > number) {
 	doc->link = HDOC(number).link;
 	doc->line = HDOC(number).line;
 	StrAllocCopy(doc->title, HDOC(number).title);
diff --git a/src/LYOptions.c b/src/LYOptions.c
index 76815bb2..ff27cb8f 100644
--- a/src/LYOptions.c
+++ b/src/LYOptions.c
@@ -1,4 +1,4 @@
-/* $LynxId: LYOptions.c,v 1.166 2015/10/08 08:52:00 Simon.Kainz Exp $ */
+/* $LynxId: LYOptions.c,v 1.167 2015/12/16 01:51:08 tom Exp $ */
 #include <HTUtils.h>
 #include <HTFTP.h>
 #include <HTTP.h>		/* 'reloading' flag */
@@ -1593,9 +1593,13 @@ static int widest_choice(STRING2PTR choices)
 static void show_choice(const char *choice,
 			int width)
 {
-    int len = (int) strlen(choice);
+    int len = 0;
 
-    LYaddstr(choice);
+    if (choice != 0) {
+	len = (int) strlen(choice);
+
+	LYaddstr(choice);
+    }
     while (len++ < width)
 	LYaddch(' ');
 }
diff --git a/src/LYStrings.c b/src/LYStrings.c
index 8c716fa2..b9411f87 100644
--- a/src/LYStrings.c
+++ b/src/LYStrings.c
@@ -1,4 +1,4 @@
-/* $LynxId: LYStrings.c,v 1.262 2015/12/14 09:52:43 tom Exp $ */
+/* $LynxId: LYStrings.c,v 1.263 2015/12/16 01:18:53 tom Exp $ */
 #include <HTUtils.h>
 #include <HTCJK.h>
 #include <UCAux.h>
@@ -5149,7 +5149,7 @@ int LYgetBString(bstring **inputline,
 	    LYFinishEdit(edit);
 	    result = ch;
 	    done = TRUE;
-	    break;
+	    continue;
 	}
 	ch |= InputMods;
 	InputMods = 0;
@@ -5238,7 +5238,7 @@ int LYgetBString(bstring **inputline,
 	    LYFinishEdit(edit);
 	    result = ch;
 	    done = TRUE;
-	    break;
+	    continue;
 
 #ifdef CAN_CUT_AND_PASTE
 	case LYE_PASTE:
@@ -5291,7 +5291,7 @@ int LYgetBString(bstring **inputline,
 	    LYFinishEdit(edit);
 	    BStrCopy0(*inputline, "");
 	    done = TRUE;
-	    break;
+	    continue;
 
 	case LYE_STOP:
 	    CTRACE((tfp, "LYgetstr LYE_STOP\n"));
@@ -5300,7 +5300,7 @@ int LYgetBString(bstring **inputline,
 	    LYFinishEdit(edit);
 	    BStrCopy0(*inputline, "");
 	    done = TRUE;
-	    break;
+	    continue;
 #else
 #ifdef ENHANCED_LINEEDIT
 	    disableEditMark();
diff --git a/src/tidy_tls.c b/src/tidy_tls.c
index 012c25d8..af5d07d5 100644
--- a/src/tidy_tls.c
+++ b/src/tidy_tls.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: tidy_tls.c,v 1.32 2015/12/15 01:41:06 tom Exp $
+ * $LynxId: tidy_tls.c,v 1.33 2015/12/16 01:23:11 tom Exp $
  * Copyright 2008-2014,2015 Thomas E. Dickey
  * with fix Copyright 2008 by Thomas Viehmann
  *
@@ -461,7 +461,7 @@ int SSL_read(SSL * ssl, void *buffer, int length)
 
     if (rc < 0 && gnutls_error_is_fatal(rc) == 0) {
 	if (rc == GNUTLS_E_REHANDSHAKE) {
-	    rc = gnutls_handshake(ssl->gnutls_state);
+	    (void) gnutls_handshake(ssl->gnutls_state);
 	    gnutls_record_send(ssl->gnutls_state, ssl->sendbuffer, (size_t) ssl->bytes_sent);
 	    rc = (int) gnutls_record_recv(ssl->gnutls_state, buffer, (size_t) length);
 	}
generated by cgit-pink 1.4.1-2-gfad0 (git 2.36.2.497.gbbea4dcf42) at 2024-12-13 22:03:49 +0000