about summary refs log tree commit diff stats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--CHANGES4
-rw-r--r--PACKAGE/version.iss2
-rw-r--r--WWW/Library/Implementation/HTAnchor.h6
-rw-r--r--WWW/Library/Implementation/HTCJK.h6
-rw-r--r--WWW/Library/Implementation/HTFTP.c12
-rw-r--r--WWW/Library/Implementation/HTFile.c4
-rw-r--r--WWW/Library/Implementation/HTMIME.c6
-rw-r--r--WWW/Library/Implementation/HTTCP.c10
-rw-r--r--WWW/Library/Implementation/HTUtils.h9
-rwxr-xr-xconfigure2
-rw-r--r--configure.in6
-rw-r--r--lynx.cfg6
-rw-r--r--makefile.in4
-rw-r--r--src/GridText.c7
-rw-r--r--src/HTFWriter.c5
-rw-r--r--src/LYExtern.c6
-rw-r--r--src/LYMainLoop.c4
-rw-r--r--src/LYUtils.c14
-rw-r--r--userdefs.h6
19 files changed, 59 insertions, 60 deletions
diff --git a/CHANGES b/CHANGES
index 3ffc3ca6..521674e1 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,9 +1,9 @@
--- $LynxId: CHANGES,v 1.616 2012/08/14 23:10:22 tom Exp $
+-- $LynxId: CHANGES,v 1.617 2012/08/15 09:47:38 tom Exp $
 ===============================================================================
 Changes since Lynx 2.8 release
 ===============================================================================
 
-2012-08-14 (2.8.8dev.13)
+2012-08-15 (2.8.8dev.13)
 * make nsl-fork work for the DNS lookup using getaddrinfo, i.e., for IPv6
   configurations (report by FLWM) -TD
 * add U+0218, U+0219, U+021a, and U+021b to 0x53, 0x73, 0x54, and 0x74,
diff --git a/PACKAGE/version.iss b/PACKAGE/version.iss
index e900e70e..51bc6750 100644
--- a/PACKAGE/version.iss
+++ b/PACKAGE/version.iss
@@ -1,7 +1,7 @@
 ; version used for Inno Setup files.

 

 ; $Format: "#define LYNX_VERSION \"$ProjectVersion$\""$

-#define LYNX_VERSION "2.8.8dev.12"
+#define LYNX_VERSION "2.8.8dev.13"
 

 #define MyAppName "Lynx"

 #define MyAppPublisher "Thomas E Dickey"

diff --git a/WWW/Library/Implementation/HTAnchor.h b/WWW/Library/Implementation/HTAnchor.h
index 679a477d..021a930d 100644
--- a/WWW/Library/Implementation/HTAnchor.h
+++ b/WWW/Library/Implementation/HTAnchor.h
@@ -1,5 +1,5 @@
 /*
- * $LynxId: HTAnchor.h,v 1.35 2012/08/09 23:50:33 tom Exp $
+ * $LynxId: HTAnchor.h,v 1.36 2012/08/15 10:48:24 tom Exp $
  *
  *	Hypertext "Anchor" Object				     HTAnchor.h
  *	==========================
@@ -114,8 +114,8 @@ extern "C" {
 	char *content_md5;	/* Content-MD5 */
 	char *message_id;	/* Message-ID */
 	char *subject;		/* Subject */
-	long content_length;	/* Content-Length */
-	long actual_length;	/* actual length may differ */
+	off_t content_length;	/* Content-Length */
+	off_t actual_length;	/* actual length may differ */
 	char *date;		/* Date */
 	char *expires;		/* Expires */
 	char *last_modified;	/* Last-Modified */
diff --git a/WWW/Library/Implementation/HTCJK.h b/WWW/Library/Implementation/HTCJK.h
index 555cff1a..06d816f5 100644
--- a/WWW/Library/Implementation/HTCJK.h
+++ b/WWW/Library/Implementation/HTCJK.h
@@ -1,5 +1,5 @@
 /*
- * $LynxId: HTCJK.h,v 1.18 2010/09/25 11:41:29 tom Exp $
+ * $LynxId: HTCJK.h,v 1.19 2012/08/15 23:11:03 tom Exp $
  *
  *			CJK character converter		HTCJK.h
  *			=======================
@@ -33,8 +33,8 @@ extern "C" {
 #define TO_HANGUL	"\033$(C"
 #define TO_ASCII	"\033(B"
 #define IS_SJIS_LO(lo)	((0x40<=lo)&&(lo!=0x7F)&&(lo<=0xFC))
-#define IS_SJIS_HI1(hi) ((0x81<=hi)&&(hi<=0x9F))	/* 1st lev. */
-#define IS_SJIS_HI2(hi) ((0xE0<=hi)&&(hi<=0xEF))	/* 2nd lev. */
+#define IS_SJIS_HI1(hi) ((0x81 <= (hi)) && ((hi) <= 0x9F))	/* 1st lev. */
+#define IS_SJIS_HI2(hi) ((0xE0 <= (hi)) && ((hi) <= 0xEF))	/* 2nd lev. */
 #define IS_SJIS(hi,lo,in_sjis) (!IS_SJIS_LO(lo)?0:IS_SJIS_HI1(hi)?(in_sjis=1):in_sjis&&IS_SJIS_HI2(hi))
 #define IS_SJIS_2BYTE(hi,lo) (IS_SJIS_LO(lo)&&(IS_SJIS_HI1(hi)||IS_SJIS_HI2(hi)))
 #define IS_SJIS_X0201KANA(lo) ((0xA1<=lo)&&(lo<=0xDF))
diff --git a/WWW/Library/Implementation/HTFTP.c b/WWW/Library/Implementation/HTFTP.c
index 9014247f..5b346f3f 100644
--- a/WWW/Library/Implementation/HTFTP.c
+++ b/WWW/Library/Implementation/HTFTP.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: HTFTP.c,v 1.102 2012/08/03 12:34:58 tom Exp $
+ * $LynxId: HTFTP.c,v 1.104 2012/08/15 23:14:42 tom Exp $
  *
  *			File Transfer Protocol (FTP) Client
  *			for a WorldWideWeb browser
@@ -251,10 +251,8 @@ static char *data_write_pointer;
 #define NEXT_DATA_CHAR next_data_char()
 static int close_connection(connection * con);
 
-#ifdef HAVE_ATOLL
-#define LYatoll(n) atoll(n)
-#else
-static off_t LYatoll(const char *value)
+#ifndef HAVE_ATOLL
+off_t LYatoll(const char *value)
 {
     off_t result = 0;
 
@@ -1853,7 +1851,7 @@ static void parse_vms_dir_entry(char *line,
 				EntryInfo *entry_info)
 {
     int i, j;
-    unsigned int ialloc;
+    off_t ialloc;
     char *cp, *cpd, *cps, date[16];
     const char *sp = " ";
 
@@ -1959,7 +1957,7 @@ static void parse_vms_dir_entry(char *line,
 	while (isdigit(UCH(*cps)))
 	    cps++;
 	*cps = '\0';
-	ialloc = (unsigned) atoi(cpd + 1);
+	ialloc = LYatoll(cpd + 1);
 	/* Check if used is in blocks or bytes */
 	if (entry_info->size <= ialloc)
 	    entry_info->size *= 512;
diff --git a/WWW/Library/Implementation/HTFile.c b/WWW/Library/Implementation/HTFile.c
index b01bac91..301214aa 100644
--- a/WWW/Library/Implementation/HTFile.c
+++ b/WWW/Library/Implementation/HTFile.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: HTFile.c,v 1.131 2012/08/02 09:04:52 tom Exp $
+ * $LynxId: HTFile.c,v 1.132 2012/08/15 22:10:08 tom Exp $
  *
  *			File Access				HTFile.c
  *			===========
@@ -199,9 +199,11 @@ static char *FormatSize(char **bufp,
 
     if (*start) {
 	sprintf(fmt, "%%%.*s" PRI_off_t, (int) sizeof(fmt) - 3, start);
+
 	HTSprintf0(bufp, fmt, entry);
     } else {
 	sprintf(fmt, "%" PRI_off_t, entry);
+
 	StrAllocCopy(*bufp, fmt);
     }
     return *bufp;
diff --git a/WWW/Library/Implementation/HTMIME.c b/WWW/Library/Implementation/HTMIME.c
index 688fb58a..66b69ab5 100644
--- a/WWW/Library/Implementation/HTMIME.c
+++ b/WWW/Library/Implementation/HTMIME.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: HTMIME.c,v 1.77 2012/08/10 11:49:03 tom Exp $
+ * $LynxId: HTMIME.c,v 1.78 2012/08/15 10:59:12 tom Exp $
  *
  *			MIME Message Parse			HTMIME.c
  *			==================
@@ -791,10 +791,10 @@ static int dispatchField(HTStream *me)
 	/*
 	 * Convert to integer and indicate in anchor.  - FM
 	 */
-	me->anchor->content_length = atoi(me->value);
+	me->anchor->content_length = LYatoll(me->value);
 	if (me->anchor->content_length < 0)
 	    me->anchor->content_length = 0;
-	CTRACE((tfp, "        Converted to integer: '%ld'\n",
+	CTRACE((tfp, "        Converted to integer: '%" PRI_off_t "'\n",
 		me->anchor->content_length));
 	break;
     case miCONTENT_LOCATION:
diff --git a/WWW/Library/Implementation/HTTCP.c b/WWW/Library/Implementation/HTTCP.c
index 616c1f0c..cafc4f7c 100644
--- a/WWW/Library/Implementation/HTTCP.c
+++ b/WWW/Library/Implementation/HTTCP.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: HTTCP.c,v 1.112 2012/08/14 23:18:41 tom Exp $
+ * $LynxId: HTTCP.c,v 1.113 2012/08/15 22:24:41 tom Exp $
  *
  *			Generic Communication Code		HTTCP.c
  *			==========================
@@ -1456,7 +1456,7 @@ static void dump_addrinfo(const char *tag, void *data)
 static size_t fill_addrinfo(char *buffer,
 			    const LYNX_ADDRINFO *phost)
 {
-    LYNX_ADDRINFO *actual = (LYNX_ADDRINFO *) buffer;
+    LYNX_ADDRINFO *actual = (LYNX_ADDRINFO *) (void *) buffer;
     int count = 0;
     char *heap = (char *) &(actual[MAX_ADDRINFO]);
 
@@ -1475,7 +1475,7 @@ static size_t fill_addrinfo(char *buffer,
 	    break;
 	}
 
-	actual->ai_addr = (struct sockaddr *) heap;
+	actual->ai_addr = (struct sockaddr *) (void *) heap;
 	MemCpy(heap, phost->ai_addr, phost->ai_addrlen);
 	heap += phost->ai_addrlen;
 
@@ -1496,13 +1496,13 @@ static size_t fill_addrinfo(char *buffer,
 static unsigned read_addrinfo(int fd, char *buffer, size_t length)
 {
     unsigned result = read_bytes(fd, buffer, length);
-    LYNX_ADDRINFO *actual = (LYNX_ADDRINFO *) buffer;
+    LYNX_ADDRINFO *actual = (LYNX_ADDRINFO *) (void *) buffer;
     int count = 0;
     char *heap = (char *) &(actual[MAX_ADDRINFO]);
 
     while (count++ < MAX_ADDRINFO) {
 	if (actual->ai_addr) {
-	    actual->ai_addr = (struct sockaddr *) heap;
+	    actual->ai_addr = (struct sockaddr *) (void *) heap;
 	    heap += actual->ai_addrlen;
 	}
 	if (actual->ai_next == 0)
diff --git a/WWW/Library/Implementation/HTUtils.h b/WWW/Library/Implementation/HTUtils.h
index 606cd1b7..60106f72 100644
--- a/WWW/Library/Implementation/HTUtils.h
+++ b/WWW/Library/Implementation/HTUtils.h
@@ -1,5 +1,5 @@
 /*
- * $LynxId: HTUtils.h,v 1.110 2012/07/04 19:37:26 tom Exp $
+ * $LynxId: HTUtils.h,v 1.112 2012/08/15 23:11:48 tom Exp $
  *
  * Utility macros for the W3 code library
  * MACROS FOR GENERAL USE
@@ -52,6 +52,7 @@ char *alloca();
 #include <limits.h>
 #endif /* DJGPP */
 
+#include <sys/types.h>
 #include <stdio.h>
 
 #define DONT_TRACK_INTERNAL_LINKS 1
@@ -185,6 +186,12 @@ extern int ignore_unused;
 #undef small			/* see <w32api/rpcndr.h> */
 #endif
 
+#ifdef HAVE_ATOLL
+#define LYatoll(n) atoll(n)
+#else
+extern off_t LYatoll(const char *value);
+#endif
+
 /* cygwin, mingw32, etc. */
 #ifdef FILE_DOES_NOT_EXIST
 #undef FILE_DOES_NOT_EXIST	/* see <w32api/winnt.h> */
diff --git a/configure b/configure
index 7df688a7..63ed7f9c 100755
--- a/configure
+++ b/configure
@@ -1270,7 +1270,7 @@ rm conftest.sed
 
 PACKAGE=lynx
 # $Format: "VERSION=$ProjectVersion$"$
-VERSION=2.8.8dev.12
+VERSION=2.8.8dev.13
 
 echo "$as_me:1275: checking for DESTDIR" >&5
 echo $ECHO_N "checking for DESTDIR... $ECHO_C" >&6
diff --git a/configure.in b/configure.in
index 41b8d08b..d313f6de 100644
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,4 @@
-dnl $LynxId: configure.in,v 1.239 2012/08/10 15:31:34 tom Exp $
+dnl $LynxId: configure.in,v 1.240 2012/08/16 00:48:47 tom Exp $
 dnl
 dnl Process this file with autoconf to produce a configure script.
 dnl
@@ -29,7 +29,7 @@ dnl ---------------------------------------------------------------------------
 dnl
 dnl ask PRCS to plug-in the project-version for the configure-script.
 dnl $Format: "AC_REVISION($ProjectVersion$)"$
-AC_REVISION(2.8.8dev.12)
+AC_REVISION(2.8.8dev.13)
 
 # Save the original $CFLAGS so we can distinguish whether the user set those
 # in the environment, or whether autoconf added -O and -g options:
@@ -64,7 +64,7 @@ AC_ARG_PROGRAM
 PACKAGE=lynx
 dnl ask PRCS to plug-in the project-version for the packages.
 # $Format: "VERSION=$ProjectVersion$"$
-VERSION=2.8.8dev.12
+VERSION=2.8.8dev.13
 
 AC_SUBST(PACKAGE)
 AC_SUBST(VERSION)
diff --git a/lynx.cfg b/lynx.cfg
index 6ebcbf3e..6deadaa9 100644
--- a/lynx.cfg
+++ b/lynx.cfg
@@ -1,13 +1,13 @@
-# $LynxId: lynx.cfg,v 1.218 2012/02/23 02:08:07 tom Exp $
+# $LynxId: lynx.cfg,v 1.219 2012/08/16 00:48:47 tom Exp $
 # lynx.cfg file.
 # The default placement for this file is /usr/local/lib/lynx.cfg (Unix)
 #                                     or Lynx_Dir:lynx.cfg (VMS)
 #
 # $Format: "#PRCS LYNX_VERSION \"$ProjectVersion$\""$
-#PRCS LYNX_VERSION "2.8.8dev.12"
+#PRCS LYNX_VERSION "2.8.8dev.13"
 #
 # $Format: "#PRCS LYNX_DATE \"$ProjectDate$\""$
-#PRCS LYNX_DATE "Wed, 22 Feb 2012 18:03:33 -0800"
+#PRCS LYNX_DATE "Wed, 15 Aug 2012 17:47:03 -0700"
 #
 # Definition pairs are of the form  VARIABLE:DEFINITION
 # NO spaces are allowed between the pair items.
diff --git a/makefile.in b/makefile.in
index dc382e52..18c05a51 100644
--- a/makefile.in
+++ b/makefile.in
@@ -1,4 +1,4 @@
-# $LynxId: makefile.in,v 1.125 2012/08/12 23:54:35 tom Exp $
+# $LynxId: makefile.in,v 1.126 2012/08/16 00:48:47 tom Exp $
 ##makefile for lynx
 
 SHELL		= @CONFIG_SHELL@
@@ -38,7 +38,7 @@ TAR_UP		= $(TAR) @TAR_UP_OPTIONS@ @TAR_PIPE_OPTIONS@
 TAR_DOWN	= $(TAR) @TAR_DOWN_OPTIONS@ @TAR_PIPE_OPTIONS@
 
 # $Format: "LYNX_VERSION	= $ProjectVersion$"$
-LYNX_VERSION	= 2.8.8dev.12
+LYNX_VERSION	= 2.8.8dev.13
 
 ## This is the version which we are developing (or, upon release, make this
 ## the same).  Use no dots in the name, since it must work on VMS and MS-DOS.
diff --git a/src/GridText.c b/src/GridText.c
index e4490310..6cea9052 100644
--- a/src/GridText.c
+++ b/src/GridText.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: GridText.c,v 1.238 2012/08/03 17:28:03 tom Exp $
+ * $LynxId: GridText.c,v 1.239 2012/08/15 22:20:41 tom Exp $
  *
  *		Character grid hypertext object
  *		===============================
@@ -14646,7 +14646,7 @@ static int LYHandleCache(const char *arg,
 #ifdef USE_SOURCE_CACHE
     char *source_cache_file = NULL;
 #endif
-    long Size = 0;
+    off_t Size = 0;
     int x = -1;
 
     /*
@@ -14760,7 +14760,8 @@ static int LYHandleCache(const char *arg,
 		   x, STR_LYNXCACHE, x, title, address, address);
 	PUTS(buf);
 	if (Size > 0) {
-	    HTSprintf0(&buf, "Size: %ld  ", Size);
+	    HTSprintf0(&buf, "Size: %" PRI_off_t "  ", Size);
+
 	    PUTS(buf);
 	}
 	if (cachedoc != NULL && cachedoc->Lines > 0) {
diff --git a/src/HTFWriter.c b/src/HTFWriter.c
index 0a4154e7..dedb7bfa 100644
--- a/src/HTFWriter.c
+++ b/src/HTFWriter.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: HTFWriter.c,v 1.99 2011/06/11 12:15:28 tom Exp $
+ * $LynxId: HTFWriter.c,v 1.100 2012/08/15 23:25:33 tom Exp $
  *
  *		FILE WRITER				HTFWrite.h
  *		===========
@@ -660,9 +660,6 @@ HTStream *HTSaveAndExecute(HTPresentation *pres,
 	    /* 1998/01/23 (Fri) 17:38:26 */
 	    unsigned char *cp, *view_fname;
 
-#define IS_SJIS_HI1(hi) ((0x81<=hi)&&(hi<=0x9F))	/* 1st lev. */
-#define IS_SJIS_HI2(hi) ((0xE0<=hi)&&(hi<=0xEF))	/* 2nd lev. */
-
 	    me->fp = NULL;
 
 	    view_fname = fnam + 3;
diff --git a/src/LYExtern.c b/src/LYExtern.c
index c6b64667..bbd0d545 100644
--- a/src/LYExtern.c
+++ b/src/LYExtern.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: LYExtern.c,v 1.49 2012/02/10 18:36:39 tom Exp $
+ * $LynxId: LYExtern.c,v 1.50 2012/08/15 23:16:22 tom Exp $
  *
  External application support.
  This feature allows lynx to pass a given URL to an external program.
@@ -31,8 +31,8 @@
 
 #ifdef WIN_EX
 /* ASCII char -> HEX digit */
-#define ASC2HEXD(x) (((x) >= '0' && (x) <= '9') ?               \
-		     ((x) - '0') : (toupper(x) - 'A' + 10))
+#define ASC2HEXD(x) ((UCH(x) >= '0' && UCH(x) <= '9') ?               \
+		     (UCH(x) - '0') : (toupper(UCH(x)) - 'A' + 10))
 
 /* Decodes the forms %xy in a URL to the character the hexadecimal
    code of which is xy. xy are hexadecimal digits from
diff --git a/src/LYMainLoop.c b/src/LYMainLoop.c
index d1520d51..0584f9a5 100644
--- a/src/LYMainLoop.c
+++ b/src/LYMainLoop.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: LYMainLoop.c,v 1.210 2012/07/07 16:28:47 tom Exp $
+ * $LynxId: LYMainLoop.c,v 1.211 2012/08/15 23:18:03 tom Exp $
  */
 #include <HTUtils.h>
 #include <HTAccess.h>
@@ -116,7 +116,7 @@ static char *str_sjis(char *to, char *from)
 	strcpy(to, from);
 #endif
     } else {
-	TO_SJIS(from, to);
+	TO_SJIS((unsigned char *) from, (unsigned char *) to);
     }
     return to;
 }
diff --git a/src/LYUtils.c b/src/LYUtils.c
index 8a7d0800..a82e30c2 100644
--- a/src/LYUtils.c
+++ b/src/LYUtils.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: LYUtils.c,v 1.225 2012/08/03 17:38:47 tom Exp $
+ * $LynxId: LYUtils.c,v 1.227 2012/08/15 23:11:03 tom Exp $
  */
 #include <HTUtils.h>
 #include <HTTCP.h>
@@ -7965,13 +7965,10 @@ static char *device_list[] =
     NULL
 };
 
-#define IS_SJIS_HI1(hi) ((0x81<=hi)&&(hi<=0x9F))	/* 1st lev. */
-#define IS_SJIS_HI2(hi) ((0xE0<=hi)&&(hi<=0xEF))	/* 2nd lev. */
-
 int unsafe_filename(const char *fname)
 {
     int i, len, sum;
-    unsigned char *cp;
+    char *cp;
     char *save;
 
     i = 0;
@@ -7985,7 +7982,7 @@ int unsafe_filename(const char *fname)
     save = cp = strdup(fname);
 
     while (*cp) {
-	if (IS_SJIS_HI1(*cp) || IS_SJIS_HI2(*cp))
+	if (IS_SJIS_HI1(UCH(*cp)) || IS_SJIS_HI2(UCH(*cp)))
 	    cp += 2;		/* KANJI skip */
 	if (IS_SEP(*cp)) {
 	    *cp = '\0';
@@ -8017,10 +8014,7 @@ int unsafe_filename(const char *fname)
     }
     free(save);
 
-    if (sum != 0)
-	return 1;
-    else
-	return 0;
+    return (sum != 0);
 }
 
 FILE *safe_fopen(const char *fname, const char *mode)
diff --git a/userdefs.h b/userdefs.h
index 2cdbec3c..c34f3c49 100644
--- a/userdefs.h
+++ b/userdefs.h
@@ -1,5 +1,5 @@
 /*
- * $LynxId: userdefs.h,v 1.270 2012/02/23 02:08:07 tom Exp $
+ * $LynxId: userdefs.h,v 1.271 2012/08/16 00:48:47 tom Exp $
  *
  * Lynx - Hypertext navigation system
  *
@@ -1432,11 +1432,11 @@
  * the version definition with the Project Version on checkout.  Just
  * ignore it. - kw */
 /* $Format: "#define LYNX_VERSION \"$ProjectVersion$\""$ */
-#define LYNX_VERSION "2.8.8dev.12"
+#define LYNX_VERSION "2.8.8dev.13"
 #define LYNX_WWW_HOME "http://lynx.isc.org/"
 #define LYNX_WWW_DIST "http://lynx.isc.org/current/"
 /* $Format: "#define LYNX_DATE \"$ProjectDate$\""$ */
-#define LYNX_DATE "Wed, 22 Feb 2012 18:03:33 -0800"
+#define LYNX_DATE "Wed, 15 Aug 2012 17:47:03 -0700"
 #define LYNX_DATE_OFF 5		/* truncate the automatically-generated date */
 #define LYNX_DATE_LEN 11	/* truncate the automatically-generated date */
generated by cgit-pink 1.4.1-2-gfad0 (git 2.36.2.497.gbbea4dcf42) at 2025-05-12 09:36:45 +0000