Update to lynx-2.8.6.rel5, with our local patches maintained where relevant.

tests from miod@ sthen@ jmc@ jsing@
two additional fixes from miod:
- fix uninitialized stack variable use, leading to occasional crash.
- modify the socklen_t test to include <sys/types.h>, fixes gcc2 build failures

1 files changed, 43 insertions, 49 deletions

diff --git a/gnu/usr.bin/lynx/WWW/Library/Implementation/HTMLDTD.h b/gnu/usr.bin/lynx/WWW/Library/Implementation/HTMLDTD.h
index d6d210963ac..248760fcb6b 100644
--- a/gnu/usr.bin/lynx/WWW/Library/Implementation/HTMLDTD.h
+++ b/gnu/usr.bin/lynx/WWW/Library/Implementation/HTMLDTD.h
@@ -15,32 +15,29 @@
 #include <SGML.h>
 #include <HTFont.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
 /*
-**  Valid name chars for tag parsing.
-*/
+ *  Valid name chars for tag parsing.
+ */
 #define IsNmStart(c) (isalpha(UCH(c)))
 #define IsNmChar(c) (isalnum(UCH(c)) || \
 		      c == '_' || c=='-' || c == '.' || c==':')
-
-
 #define ReallyEmptyTagNum(e) ((HTML_dtd.tags[e].contents == SGML_EMPTY) && \
 			      !(HTML_dtd.tags[e].flags & Tgf_nreie))
 #define ReallyEmptyTag(t) ((t->contents == SGML_EMPTY) && \
 			   !(t->flags & Tgf_nreie))
-
 /*
 
 Element Numbers
 
- */
-
-/*
+ *//*
 
    Must Match all tables by element!
    These include tables in HTMLDTD.c and code in HTML.c.
 
- */
-typedef enum {
+ */ typedef enum {
 	HTML_A,
 	HTML_ABBREV,
 	HTML_ACRONYM,
@@ -159,7 +156,8 @@ typedef enum {
 	HTML_VAR,
 	HTML_WBR,
 	HTML_XMP,
-	HTML_ALT_OBJECT } HTMLElement;
+	HTML_ALT_OBJECT
+    } HTMLElement;
 
 /* Notes: HTML.c uses a different extension of the HTML_ELEMENTS space
           privately, see HTNestedList.h. */
@@ -174,7 +172,6 @@ typedef enum {
                       additional variant(s) at end. */
 #define HTML_ALL_ELEMENTS 119
 
-
 /*
 
 Attribute numbers
@@ -188,7 +185,7 @@ Attribute numbers
 
  */
 #define HTML_A_ACCESSKEY        0
-#define HTML_A_CHARSET          1 /* i18n draft, added tentatively - KW */
+#define HTML_A_CHARSET          1	/* i18n draft, added tentatively - KW */
 #define HTML_A_CLASS            2
 #define HTML_A_CLEAR            3
 #define HTML_A_COORDS           4
@@ -465,7 +462,7 @@ Attribute numbers
 #define HTML_FONT_STYLE         8
 #define HTML_FONT_ATTRIBUTES    9
 
-#define HTML_FORM_ACCEPT_CHARSET  0 /* HTML 4.0 draft - kw */
+#define HTML_FORM_ACCEPT_CHARSET  0	/* HTML 4.0 draft - kw */
 #define HTML_FORM_ACTION        1
 #define HTML_FORM_CLASS         2
 #define HTML_FORM_CLEAR         3
@@ -571,7 +568,7 @@ Attribute numbers
 #define HTML_IMG_ATTRIBUTES     19
 
 #define HTML_INPUT_ACCEPT       0
-#define HTML_INPUT_ACCEPT_CHARSET  1 /* RFC 2070 HTML i18n - kw */
+#define HTML_INPUT_ACCEPT_CHARSET  1	/* RFC 2070 HTML i18n - kw */
 #define HTML_INPUT_ALIGN        2
 #define HTML_INPUT_ALT          3
 #define HTML_INPUT_CHECKED      4
@@ -604,12 +601,12 @@ Attribute numbers
 #define HTML_INPUT_WIDTH       31
 #define HTML_INPUT_ATTRIBUTES  32
 
-#define HTML_ISINDEX_ACTION     0  /* Treat as synonym for HREF. - FM */
+#define HTML_ISINDEX_ACTION     0	/* Treat as synonym for HREF. - FM */
 #define HTML_ISINDEX_DIR        1
-#define HTML_ISINDEX_HREF       2  /* HTML 3.0 "action". - FM */
+#define HTML_ISINDEX_HREF       2	/* HTML 3.0 "action". - FM */
 #define HTML_ISINDEX_ID         3
 #define HTML_ISINDEX_LANG       4
-#define HTML_ISINDEX_PROMPT     5  /* HTML 3.0 "prompt". - FM */
+#define HTML_ISINDEX_PROMPT     5	/* HTML 3.0 "prompt". - FM */
 #define HTML_ISINDEX_TITLE      6
 #define HTML_ISINDEX_ATTRIBUTES 7
 
@@ -661,7 +658,7 @@ Attribute numbers
 #define HTML_LI_VALUE          12
 #define HTML_LI_ATTRIBUTES     13
 
-#define HTML_LINK_CHARSET       0 /* RFC 2070 HTML i18n - kw */
+#define HTML_LINK_CHARSET       0	/* RFC 2070 HTML i18n - kw */
 #define HTML_LINK_CLASS         1
 #define HTML_LINK_HREF          2
 #define HTML_LINK_ID            3
@@ -695,7 +692,7 @@ Attribute numbers
 #define HTML_MATH_ATTRIBUTES    8
 
 #define HTML_META_CONTENT       0
-#define HTML_META_HTTP_EQUIV    1  /* For parsing in HTML.c - FM */
+#define HTML_META_HTTP_EQUIV    1	/* For parsing in HTML.c - FM */
 #define HTML_META_NAME          2
 #define HTML_META_ATTRIBUTES    3
 
@@ -707,7 +704,7 @@ Attribute numbers
 #define HTML_NOTE_ID            3
 #define HTML_NOTE_LANG          4
 #define HTML_NOTE_MD            5
-#define HTML_NOTE_ROLE          6 /* Old name for CLASS - FM */
+#define HTML_NOTE_ROLE          6	/* Old name for CLASS - FM */
 #define HTML_NOTE_SRC           7
 #define HTML_NOTE_STYLE         8
 #define HTML_NOTE_TITLE         9
@@ -809,7 +806,7 @@ Attribute numbers
 #define HTML_PARAM_TITLE       13
 #define HTML_PARAM_TYPE        14
 #define HTML_PARAM_VALUE       15
-#define HTML_PARAM_VALUEREF    16  /* Use VALUETYPE (DATA|REF|OBJECT). - FM */
+#define HTML_PARAM_VALUEREF    16	/* Use VALUETYPE (DATA|REF|OBJECT). - FM */
 #define HTML_PARAM_VALUETYPE   17
 #define HTML_PARAM_ATTRIBUTES  18
 
@@ -918,7 +915,7 @@ Attribute numbers
 #define HTML_TD_WIDTH          19
 #define HTML_TD_ATTRIBUTES     20
 
-#define HTML_TEXTAREA_ACCEPT_CHARSET  0 /* RFC 2070 HTML i18n - kw */
+#define HTML_TEXTAREA_ACCEPT_CHARSET  0		/* RFC 2070 HTML i18n - kw */
 #define HTML_TEXTAREA_ALIGN     1
 #define HTML_TEXTAREA_CLASS     2
 #define HTML_TEXTAREA_CLEAR     3
@@ -973,19 +970,19 @@ Attribute numbers
 
 #ifdef USE_PRETTYSRC
 /* values of HTML attributes' types */
-#define HTMLA_NORMAL 0 /* nothing specific */
-#define HTMLA_ANAME  1 /* anchor name - 'id' or a's 'name' */
-#define HTMLA_HREF   2 /* href */
-#define HTMLA_CLASS  4 /* class name.  */
-#define HTMLA_AUXCLASS 8 /* attribute, the value of which also designates
-			    a class name */
+#define HTMLA_NORMAL 0		/* nothing specific */
+#define HTMLA_ANAME  1		/* anchor name - 'id' or a's 'name' */
+#define HTMLA_HREF   2		/* href */
+#define HTMLA_CLASS  4		/* class name.  */
+#define HTMLA_AUXCLASS 8	/* attribute, the value of which also designates
+				   a class name */
 #endif
-extern CONST SGML_dtd HTML_dtd;
+    extern const SGML_dtd HTML_dtd;
 
-extern void HTSwitchDTD PARAMS((int new_flag));
+    extern void HTSwitchDTD(int new_flag);
 
-extern HTTag HTTag_unrecognized;
-extern HTTag HTTag_mixedObject;
+    extern HTTag HTTag_unrecognized;
+    extern HTTag HTTag_mixedObject;
 
 /*
 
@@ -1002,17 +999,13 @@ Start anchor element
    to be omitted.
 
  */
-extern void HTStartAnchor PARAMS((
-		HTStructured * targetstream,
-		CONST char *	name,
-		CONST char *	href));
-
-extern void HTStartAnchor5 PARAMS((
-		HTStructured * targetstream,
-		CONST char *	name,
-		CONST char *	href,
-		CONST char *	linktype,
-		int		tag_charset));
+    extern void HTStartAnchor(HTStructured * targetstream, const char *name,
+			      const char *href);
+
+    extern void HTStartAnchor5(HTStructured * targetstream, const char *name,
+			       const char *href,
+			       const char *linktype,
+			       int tag_charset);
 
 /*
 
@@ -1029,9 +1022,10 @@ Start IsIndex element - FM
    to be omitted.
 
  */
-extern void HTStartIsIndex PARAMS((
-		HTStructured * targetstream,
-		CONST char *	prompt,
-		CONST char *	href));
+    extern void HTStartIsIndex(HTStructured * targetstream, const char *prompt,
+			       const char *href);
 
-#endif /* HTMLDTD_H */
+#ifdef __cplusplus
+}
+#endif
+#endif				/* HTMLDTD_H */