summaryrefslogtreecommitdiffstats
path: root/WWW
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-04-27 19:36:21 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-04-27 19:36:21 +0000
commit2ee7775ccfde81ab26358da5d06fa4a8130f6d92 (patch)
tree393a6873c4d7b9bd0d8906862aaf3f596e2fbd95 /WWW
parentAdding upstream version 2.9.0rel.0. (diff)
downloadlynx-2ee7775ccfde81ab26358da5d06fa4a8130f6d92.tar.xz
lynx-2ee7775ccfde81ab26358da5d06fa4a8130f6d92.zip
Adding upstream version 2.9.1.upstream/2.9.1
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to '')
-rw-r--r--WWW/Library/Implementation/HTFTP.c7
-rw-r--r--WWW/Library/Implementation/HTFile.c4
-rw-r--r--WWW/Library/Implementation/HTFormat.c4
-rw-r--r--WWW/Library/Implementation/HTMLGen.c8
-rw-r--r--WWW/Library/Implementation/HTUtils.h5
-rw-r--r--WWW/Library/Implementation/SGML.c7
-rw-r--r--WWW/Library/Implementation/makefile.in6
-rw-r--r--WWW/Library/Implementation/www_tcp.h8
8 files changed, 22 insertions, 27 deletions
diff --git a/WWW/Library/Implementation/HTFTP.c b/WWW/Library/Implementation/HTFTP.c
index decf559..a08701c 100644
--- a/WWW/Library/Implementation/HTFTP.c
+++ b/WWW/Library/Implementation/HTFTP.c
@@ -1,5 +1,5 @@
/*
- * $LynxId: HTFTP.c,v 1.148 2023/01/05 09:17:15 tom Exp $
+ * $LynxId: HTFTP.c,v 1.149 2024/03/21 07:51:10 tom Exp $
*
* File Transfer Protocol (FTP) Client
* for a WorldWideWeb browser
@@ -2189,7 +2189,10 @@ static void parse_cms_dir_entry(char *line,
set_years_and_date();
}
- /* Track down the date. */
+ /* Track down the date using the ":" separating hours/minutes:
+ * mm/dd/yy hh:mm
+ * 01234567890123
+ */
cpd = cps;
if (((cps < end) &&
(cps = StrChr(cpd, ':')) != NULL) &&
diff --git a/WWW/Library/Implementation/HTFile.c b/WWW/Library/Implementation/HTFile.c
index 8fdaa2c..e9a225d 100644
--- a/WWW/Library/Implementation/HTFile.c
+++ b/WWW/Library/Implementation/HTFile.c
@@ -1,5 +1,5 @@
/*
- * $LynxId: HTFile.c,v 1.158 2022/07/25 23:52:05 tom Exp $
+ * $LynxId: HTFile.c,v 1.159 2024/04/11 20:19:06 tom Exp $
*
* File Access HTFile.c
* ===========
@@ -1313,7 +1313,7 @@ CompressFileType HTCompressFileType(const char *filename,
*/
const char *HTCompressTypeToSuffix(CompressFileType method)
{
- const char *result = "";
+ const char *result;
switch (method) {
default:
diff --git a/WWW/Library/Implementation/HTFormat.c b/WWW/Library/Implementation/HTFormat.c
index a830387..198ea51 100644
--- a/WWW/Library/Implementation/HTFormat.c
+++ b/WWW/Library/Implementation/HTFormat.c
@@ -1,5 +1,5 @@
/*
- * $LynxId: HTFormat.c,v 1.96 2022/03/31 23:39:38 tom Exp $
+ * $LynxId: HTFormat.c,v 1.97 2024/04/11 20:19:35 tom Exp $
*
* Manage different file formats HTFormat.c
* =============================
@@ -1378,7 +1378,7 @@ static int HTBrFileCopy(FILE *brfp, HTStream *sink)
char *normal_buffer = NULL;
size_t brotli_size;
size_t brotli_limit = 0;
- size_t brotli_offset = brotli_limit;
+ size_t brotli_offset;
size_t normal_size;
size_t normal_limit = 0;
diff --git a/WWW/Library/Implementation/HTMLGen.c b/WWW/Library/Implementation/HTMLGen.c
index c63723c..7cf7bb9 100644
--- a/WWW/Library/Implementation/HTMLGen.c
+++ b/WWW/Library/Implementation/HTMLGen.c
@@ -1,5 +1,5 @@
/*
- * $LynxId: HTMLGen.c,v 1.46 2020/01/21 22:02:35 tom Exp $
+ * $LynxId: HTMLGen.c,v 1.47 2024/03/13 23:48:59 tom Exp $
*
* HTML Generator
* ==============
@@ -160,7 +160,7 @@ static void allow_break(HTStructured * me, int new_cleanness, int dlbc)
* ------------------
*
* The tricky bits are the line break handling. This attempts
- * to synchrononise line breaks on sentence or phrase ends. This
+ * to synchronize line breaks on sentence or phrase ends. This
* is important if one stores SGML files in a line-oriented code
* repository, so that if a small change is made, line ends don't
* shift in a ripple-through to apparently change a large part of the
@@ -466,7 +466,7 @@ static int HTMLGen_start_element(HTStructured * me, int element_number,
/*
* Make very specific HTML assumption that PRE can't be nested!
*/
- me->preformatted = (BOOL) ((element_number == HTML_PRE)
+ me->preformatted = (BOOL) ((element_number == HTML_PRE || element_number == HTML_XMP)
? YES
: was_preformatted);
@@ -538,7 +538,7 @@ static int HTMLGen_end_element(HTStructured * me, int element_number,
HTMLGen_put_string(me, "</");
HTMLGen_put_string(me, HTML_dtd.tags[element_number].name);
HTMLGen_put_character(me, '>');
- if (element_number == HTML_PRE) {
+ if (element_number == HTML_PRE || element_number == HTML_XMP) {
me->preformatted = NO;
}
#ifdef USE_COLOR_STYLE
diff --git a/WWW/Library/Implementation/HTUtils.h b/WWW/Library/Implementation/HTUtils.h
index 3d66cab..5a14027 100644
--- a/WWW/Library/Implementation/HTUtils.h
+++ b/WWW/Library/Implementation/HTUtils.h
@@ -1,5 +1,5 @@
/*
- * $LynxId: HTUtils.h,v 1.135 2023/11/05 23:09:43 tom Exp $
+ * $LynxId: HTUtils.h,v 1.137 2024/03/17 23:04:27 tom Exp $
*
* Utility macros for the W3 code library
* MACROS FOR GENERAL USE
@@ -140,7 +140,6 @@ char *alloca();
/* suppress inadvertent use of gettext in makeuctb when cross-compiling */
#ifdef DONT_USE_GETTEXT
#undef HAVE_GETTEXT
-#undef HAVE_LIBGETTEXT_H
#undef HAVE_LIBINTL_H
#endif
@@ -618,7 +617,7 @@ extern int WWW_TraceMask;
#ifndef PRI_off_t
#define GUESS_PRI_off_t
-#if (SIZEOF_OFF_T == SIZEOF_LONG)
+#if defined(SIZEOF_OFF_T) && defined(SIZEOF_LONG) && (SIZEOF_OFF_T == SIZEOF_LONG)
#define PRI_off_t "ld"
#define SCN_off_t "ld"
#define CAST_off_t(n) (long)(n)
diff --git a/WWW/Library/Implementation/SGML.c b/WWW/Library/Implementation/SGML.c
index c256685..d689bbd 100644
--- a/WWW/Library/Implementation/SGML.c
+++ b/WWW/Library/Implementation/SGML.c
@@ -1,5 +1,5 @@
/*
- * $LynxId: SGML.c,v 1.186 2023/10/25 22:35:29 tom Exp $
+ * $LynxId: SGML.c,v 1.188 2024/04/11 20:22:19 tom Exp $
*
* General SGML Parser code SGML.c
* ========================
@@ -242,9 +242,10 @@ struct _HTStream {
#else
static const char *state_name(sgml_state n)
{
- const char *result = "?";
+ const char *result;
/* *INDENT-OFF* */
switch (n) {
+ default:
case S_attr: result = "S_attr"; break;
case S_attr_gap: result = "S_attr_gap"; break;
case S_comment: result = "S_comment"; break;
@@ -5023,11 +5024,9 @@ unsigned char *TO_EUC(const unsigned char *jis,
unsigned char *d;
int to1B, to2B;
int in_sjis = 0;
- static int nje;
int n8bits;
int is_JIS;
- nje++;
n8bits = 0;
s = jis;
d = euc;
diff --git a/WWW/Library/Implementation/makefile.in b/WWW/Library/Implementation/makefile.in
index 0b467d7..44de1c7 100644
--- a/WWW/Library/Implementation/makefile.in
+++ b/WWW/Library/Implementation/makefile.in
@@ -1,4 +1,4 @@
-# $LynxId: makefile.in,v 1.35 2021/07/16 20:01:00 tom Exp $
+# $LynxId: makefile.in,v 1.36 2024/03/17 22:13:00 tom Exp $
# Make WWW under unix for a.n.other unix system (bsd)
# Use this as a template
@@ -31,15 +31,13 @@ RANLIB = @RANLIB@
o = .@OBJEXT@
x = @EXEEXT@
-INTLDIR_CPPFLAGS= @INTLDIR_CPPFLAGS@ -I$(top_srcdir)/intl
-
CPP = @CPP@
CPPOPTS = $(DEFS) $(LYFLAGS) \
-I../../.. \
-I../../../src \
-I$(top_srcdir) \
-I$(top_srcdir)/src \
- $(INTLDIR_CPPFLAGS) -I$(WWWINC) $(EXTRA_CPPFLAGS) $(CPPFLAGS)
+ -I$(WWWINC) $(EXTRA_CPPFLAGS) $(CPPFLAGS)
LY_CFLAGS = @CFLAGS@ @EXTRA_CFLAGS@
CFLAGS = $(CPPOPTS) $(LY_CFLAGS)
diff --git a/WWW/Library/Implementation/www_tcp.h b/WWW/Library/Implementation/www_tcp.h
index ef754c8..1bc20e0 100644
--- a/WWW/Library/Implementation/www_tcp.h
+++ b/WWW/Library/Implementation/www_tcp.h
@@ -1,5 +1,5 @@
/* System dependencies in the W3 library
- * $LynxId: www_tcp.h,v 1.61 2018/12/26 12:30:14 tom Exp $
+ * $LynxId: www_tcp.h,v 1.63 2024/03/17 23:04:27 tom Exp $
*
SYSTEM DEPENDENCIES
@@ -804,7 +804,7 @@ typedef unsigned short mode_t;
#if defined(VMS)
#define socklen_t unsigned
-#else
+#elif defined(_WINDOWS)
#define socklen_t int /* used for default LY_SOCKLEN definition */
#endif
@@ -814,10 +814,6 @@ typedef unsigned short mode_t;
#include <libintl.h>
#endif
-#ifdef HAVE_LIBGETTEXT_H
-#include <libgettext.h>
-#endif
-
#define N_(s) s
#ifndef HAVE_GETTEXT