Commit 24aae586 authored by Axel Beckert's avatar Axel Beckert

Imported Upstream version 2.8.8dev.7

parent aa28fa09
// $LynxId: lynx_cfg.h,v 1.4 2009/11/21 16:33:41 tom Exp $
// $LynxId: lynx_cfg.h,v 1.5 2010/11/06 13:37:00 tom Exp $
// definitions abstracted from makefile.msc
#ifndef LYNX_CFG_H
......@@ -6,7 +6,7 @@
#define __WIN32__
#define _WINDOWS
#define _WIN32_WINNT 0x0400
#define _WIN32_WINNT 0x0400
#define ACCESS_AUTH 1
#define CJK_EX 1
......@@ -61,8 +61,8 @@
#define FANCY_CURSES 1
#endif
#pragma warning (disable : 4244) /* conversion from 'xxx' to 'yyy', possible loss of data */
#pragma warning (disable : 4267) /* conversion from 'xxx' to 'yyy', possible loss of data */
#pragma warning (disable : 4311) /* 'type cast': pointer truncation from 'xxx' to 'yyy' FIXME */
#pragma warning (disable : 4244) /* conversion from 'xxx' to 'yyy', possible loss of data */
#pragma warning (disable : 4267) /* conversion from 'xxx' to 'yyy', possible loss of data */
#pragma warning (disable : 4311) /* 'type cast': pointer truncation from 'xxx' to 'yyy' FIXME */
#endif /* LYNX_CFG_H */
\ No newline at end of file
#endif /* LYNX_CFG_H */
// $LynxId: lynx_cfg.h,v 1.3 2009/11/21 16:33:41 tom Exp $
// $LynxId: lynx_cfg.h,v 1.4 2010/11/06 13:37:00 tom Exp $
// definitions abstracted from makefile.msc
#ifndef LYNX_CFG_H
......@@ -62,9 +62,9 @@
#define FANCY_CURSES 1
#endif
#pragma warning (disable : 4244) /* conversion from 'xxx' to 'yyy', possible loss of data */
#pragma warning (disable : 4267) /* conversion from 'xxx' to 'yyy', possible loss of data */
#pragma warning (disable : 4311) /* 'type cast': pointer truncation from 'xxx' to 'yyy' FIXME */
#pragma warning (disable : 4996) /* 'xxx': This function or variable may be unsafe. Consider using yyy instead. */
#pragma warning (disable : 4244) /* conversion from 'xxx' to 'yyy', possible loss of data */
#pragma warning (disable : 4267) /* conversion from 'xxx' to 'yyy', possible loss of data */
#pragma warning (disable : 4311) /* 'type cast': pointer truncation from 'xxx' to 'yyy' FIXME */
#pragma warning (disable : 4996) /* 'xxx': This function or variable may be unsafe. Consider using yyy instead. */
#endif /* LYNX_CFG_H */
\ No newline at end of file
#endif /* LYNX_CFG_H */
-- $LynxId: CHANGES,v 1.508 2010/10/04 08:19:06 tom Exp $
-- $LynxId: CHANGES,v 1.525 2010/12/11 14:28:43 tom Exp $
===============================================================================
Changes since Lynx 2.8 release
===============================================================================
2010-12-11 (2.8.8dev.7)
* add PERSONAL_MAIL_NAME to options menu and .lynxrc (Debian #603647) -TD
* remind user how to cancel message (Debian #292787) -TD
* add HTML5_CHARSETS feature, which allows the user to choose whether to
interpret pages without an explicit charset according to the HTML5
"compatibility" feature (Debian #604466, #514897) -TD
* add EXTERNAL_MENU feature to lynx.cfg, which allows the user to customize the
menu-entry shown, e.g., to suppress the display of the URL
(Debian #603646) -TD
* cleanup URLs in lynx documentation -DK
* add check in getfile() when handling a "mailto:" url, to prevent it when the
user has requested a dump (Debian #533308) -TD
* improve configure check for IDNA library, which may depend upon intllib,
e.g., building with mingw on cygwin -DK
* modify autoconf macros which look for X libraries, e.g., for PDCurses, to
accommodate ongoing changes in xorg package scripts -TD
* reorganize autoconf macro CF_WITH_CURSES_DIR, to make it usable for both
curses and ncurses -TD
* several changes to autoconf macros to lessen use of legacy shell feature
"${name-value}" in favor of "${name:-value}", since the former is broken in
recent versions of bash -TD
* apply overlooked patch from pre-2.8.5, makes RMDIR_PATH configurable
(report/patch by Frank Heckenbach).
* correct one of the places where link-number is formatted, for form input
anchors. This was broken in dev.6 by the -unique_urls changes (report by
DK) -TD
* undo a cleanup change to link-types from dev.6 which broke some uses of
input-anchors (report by FLWM) -TD
* minor formatting improvements to sources using cindent 2.0-20101107 -TD
* restore \r to \n conversion in HTML_put_character(), broken in gcc warning
cleanup (report by FLWM) -TD
* fix a double-free in make_argv() (report by FLWM) -TD
* add a memset in RestoreSession(), fixes uninitialized memory reference for
the VLINK section -PBM
* update config.guess (2010-09-24), config.sub (2010-09-11)
2010-10-04 (2.8.8dev.6)
* amend change for Debian #514897 to exclude XML documents (Debian #592883) -TD
* use HTParsePort() in a few places, e.g., HTFinger.c, to allow for IPv6
......
......@@ -915,10 +915,10 @@ Borland C:
The original Win32 port was built with Borland C++ 4.52, but later
versions reportedly can be used. Before compiling the Lynx sources, you
need a curses library, and it is recommended that you have the zlib
library. Get pdcurses2.3 from "http://www.lightlink.com/hessling/". I
library. Get pdcurses2.3 from "http://pdcurses.sourceforge.net/". I
have modified it so that mouse support is no longer broken for Lynx (see
"http://www.fdisk.com/doslynx/"). You will want to get zlib from
"http://www.gzip.org/zlib/ ". Compile these libraries, and
"http://www.zlib.net/ ". Compile these libraries, and
put them in a convenient place (pdcurses inside the Lynx directory).
Unpack the latest Lynx source distribution, and make an obj directory
......@@ -938,6 +938,7 @@ Borland C:
information can be found in "http://www.fdisk.com/doslynx/lynxport.htm".
-- 1997/10/12 - W. Buttles <lynx-port@fdisk.com>
-- 2010/11/27 - URL's updated by Doug Kaufman <dkaufman@rahul.net>
Cygwin:
It is possible to compile under the cygwin system, which will allow you to
......@@ -1013,7 +1014,7 @@ V. Compile instructions -- 386 DOS
If you wish to compile with "USE_ZLIB" (recommended), you must have the
zlib library. Get the source from
http://www.gzip.org/zlib/
http://www.zlib.net
and compile it. Put libz.a in the lib subdirectory of DJGPP, and put
zlib.h and zconf.h in the include subdirectory.
......@@ -1021,8 +1022,8 @@ V. Compile instructions -- 386 DOS
package and a TCP package. You can use PDCurses (available at
"http://pdcurses.sourceforge.net/") and the DJGPP port of WATTCP. The
updated version of WATTCP is known as WATT-32, and is available at
"http://www.bgnett.no/~giva/". You can also use slang (available at
"http://www.s-lang.org/") as your screen library. You must
"http://home.broadpark.no/~gvanem/". You can also use slang (available at
"http://www.jedsoft.org/slang/") as your screen library. You must
compile these before you go any further. If you wish to use PDCurses 2.6,
you need to first apply the following patch:
......@@ -1154,13 +1155,13 @@ V. Compile instructions -- 386 DOS
If you wish to compile with SSL enabled, you need to get and compile
OpenSSL. The DJGPP port has been successfully compiled with the
0.9.7 stable series of OpenSSL. DJGPP can compile OpenSSL from the
development version of OpenSSL. DJGPP can compile OpenSSL from the
standard source distribution (http://www.openssl.org/). See the file
"INSTALL.DJGPP" in the OpenSSL distribution.
If you have trouble applying the patches, try using the "patch" program,
("http://www.delorie.com/pub/djgpp/current/v2gnu/pat253b.zip").
("http://www.delorie.com/pub/djgpp/current/v2gnu/pat261b.zip").
To read the Unix man style documentation, use, for example, "less"
("http://www.delorie.com/pub/djgpp/current/v2gnu/lss374b.zip").
Compile or place your compiled PDCurses library in /djgpp/pdcur26, and
......@@ -1197,27 +1198,27 @@ V. Compile instructions -- 386 DOS
If all goes well, you will have a lynx.exe file. If you have trouble,
check to be sure djgpp.env is the way it came in the original package.
To test Lynx_386 you must have a packet driver installed. The simplest
method is to use a null packet driver that just allows Lynx to start up,
but doesn't do anything else. One such executable driver has been posted,
uuencoded, to the lynx-dev mailing list:
"http://www.flora.org/lynx-dev/html/month011998/msg00057.html".
Start the dummy packet driver with "nullpkt 0x60", and take it out of
memory with "nullpkt -u". You can also use slip8250.com. See the CRYNWR
package "ftp://ftp.simtel.net/pub/simtelnet/msdos/pktdrvr/pktd11.zip".
Usage is "slip8250 0x60", but you may have to invoke it as, for example,
"slip8250 0x60 6 3 0x2F8" so that it uses COM2 and IRQ 3, in order to
avoid an IRQ conflict with a mouse or some other device. Another packet
To test Lynx_386 you must have a packet driver installed. The simplest
method is to use a null packet driver that just allows Lynx to start
up, but doesn't do anything else. One such executable driver has been
posted, uuencoded, to the lynx-dev mailing list in January 1998,
but is corrupted in the mailing list archive. You can get this at
"http://www.ncf.ca/ncf/pda/computer/dos/net/nullpkt.zip". Start the
dummy packet driver with "nullpkt 0x60", and take it out of memory with
"nullpkt -u". You can also use slip8250.com. See the CRYNWR package
"ftp://ftp.simtel.net/pub/simtelnet/msdos/pktdrvr/pktd11.zip". Usage
is "slip8250 0x60", but you may have to invoke it as, for example,
"slip8250 0x60 6 3 0x2F8" so that it uses COM2 and IRQ 3, in order to
avoid an IRQ conflict with a mouse or some other device. Another packet
driver is slipper.exe, which is available from many sites, including
"ftp://ftp.trumpet.com.au/slipper". To remove it from memory use
termin.com (usage "termin 0x60"), available in the CRYNWR package. To
connect over a dialup PPP connection you need dosppp or klos' pppshare.
(Find at:
"http://www.cavazza.it/file/bbs/intsoft/slippr15.zip". To remove it from
memory use termin.com (usage "termin 0x60"), available in the CRYNWR
package. To connect over a dialup PPP connection you need dosppp or klos'
pppshare. (Find at:
"http://www.ibiblio.org/pub/micro/pc-stuff/freedos/files/net/dosppp/dosppp06.zip"
"http://www.ncf.carleton.ca/ncf/pda/computer/dos/net/dosppp06.zip"
"http://mvmpc200.ciw.uni-karlsruhe.de/~mvmpc9/user/TONI/dosppp/dosppp06.zip"
"ftp://ftp.oldskool.org/pub/tvdog/internet/dosppp06.zip";
"ftp://ftp.klos.com/pub/demo/pppshare.exe")
"http://www.cavazza.it/file/bbs/intsoft/dosppp06.zip"
"http://www.cavazza.it/file/bbs/intsoft/pppshare.exe")
File access looks like this:
......@@ -1254,7 +1255,7 @@ V. Compile instructions -- 386 DOS
lynx2-* directory. Place a copy of this batch file, named "djgpp.bat",
in the lynx2-* directory, move to that directory and type "djgpp". A more
complete batch file with error checking and annotation can be found at:
"http://www.flora.org/lynx-dev/html/month111997/msg00250.html".
"http://lists.nongnu.org/archive/html/lynx-dev/1997-11/msg00250.html".
If you use the configure method, remember that if you configure with
the option "--enable-nls", you also need to set LIBS="-liconv". A
......@@ -1285,7 +1286,7 @@ V. Compile instructions -- 386 DOS
-- 1997/9/29 - D. Kaufman <dkaufman@rahul.net>
-- 1997/10/3 - B. Schiavo <Wschiavo@concentric.net>
-- Last update - 2004/01/19
-- Last update - 2010/11/27
VI. General installation instructions
......@@ -1387,4 +1388,4 @@ VIII. Acknowledgment
-- 1999/04/24 - H. Nelson <lynx-admin@irm.nara.kindai.ac.jp>
-- vile:txtmode
-- $LynxId: INSTALLATION,v 1.113 2010/09/19 18:40:53 tom Exp $
-- $LynxId: INSTALLATION,v 1.114 2010/12/08 01:28:43 Doug.Kaufman Exp $
/*
* $LynxId: LYMessages_en.h,v 1.70 2009/05/28 23:11:50 tom Exp $
* $LynxId: LYMessages_en.h,v 1.71 2010/12/08 01:28:43 Doug.Kaufman Exp $
*
* Lynx - Hypertext navigation system
*
......@@ -20,11 +20,6 @@
* debugging (CTRACE) or (b) are constants used in interaction with
* other programs.
*
* Links to collections of alternate definitions, developed by the Lynx
* User Community, are maintained in Lynx links:
*
* http://www.subir.com/lynx.html
*
* See ABOUT-NLS and po/readme for details and location of contributed
* translations. When no translation is available, the English default is
* used.
......
lynx-dev (2.8.8dev.7) unstable; urgency=low
* changes for dev.7
-- Thomas E. Dickey <dickey@invisible-island.net> Mon, 01 Nov 2010 17:32:06 -0400
lynx-dev (2.8.8dev.6) unstable; urgency=low
* add build-script for testing, adapted from Debian lynx-cur package.
......
# $LynxId: lynx.spec,v 1.6 2010/09/21 23:18:23 tom Exp $
# $LynxId: lynx.spec,v 1.7 2010/11/01 21:31:25 tom Exp $
Summary: A text-based Web browser
Name: lynx
Version: 2.8.8
Release: dev.6
Release: dev.7
License: GPLv2
Group: Applications/Internet
Source: lynx%{version}%{release}.tgz
......
; version used for Inno Setup files.
; $Format: "#define LYNX_VERSION \"$ProjectVersion$\""$
#define LYNX_VERSION "2.8.8dev.6"
#define LYNX_VERSION "2.8.8dev.7"
#define MyAppName "Lynx"
#define MyAppPublisher "Thomas E Dickey"
......
/*
* $LynxId: HTAABrow.h,v 1.15 2010/09/25 11:42:32 tom Exp $
* $LynxId: HTAABrow.h,v 1.16 2010/10/27 00:13:53 tom Exp $
*
* BROWSER SIDE ACCESS AUTHORIZATION MODULE
......@@ -40,8 +40,7 @@
extern "C" {
#endif
/*
Routines for Browser Side Recording of AA Info
Routines for Browser Side Recording of AA Info
Most of the browser-side AA is done by the following two functions (which are called
from file HTTP.c so the browsers using libwww only need to be linked with the new
......@@ -55,24 +54,26 @@ Routines for Browser Side Recording of AA Info
HTAA_shouldRetryWithAuth() determines whether to retry the request with AA or with a
new AA (in case username or password was misspelled).
*//* PUBLIC HTAA_composeAuth()
*
* COMPOSE THE ENTIRE AUTHORIZATION HEADER LINE IF WE
* ALREADY KNOW, THAT THE HOST MIGHT REQUIRE AUTHORIZATION
*
* ON ENTRY:
* hostname is the hostname of the server.
* portnumber is the portnumber in which the server runs.
* docname is the pathname of the document (as in URL)
*
* ON EXIT:
* returns NULL, if no authorization seems to be needed, or
* if it is the entire Authorization: line, e.g.
*
* "Authorization: basic username:password"
*
* As usual, this string is automatically freed.
*/ extern char *HTAA_composeAuth(const char *hostname,
*/
/* PUBLIC HTAA_composeAuth()
*
* COMPOSE THE ENTIRE AUTHORIZATION HEADER LINE IF WE
* ALREADY KNOW, THAT THE HOST MIGHT REQUIRE AUTHORIZATION
*
* ON ENTRY:
* hostname is the hostname of the server.
* portnumber is the portnumber in which the server runs.
* docname is the pathname of the document (as in URL)
*
* ON EXIT:
* returns NULL, if no authorization seems to be needed, or
* if it is the entire Authorization: line, e.g.
*
* "Authorization: basic username:password"
*
* As usual, this string is automatically freed.
*/
extern char *HTAA_composeAuth(const char *hostname,
const int portnumber,
const char *docname,
int IsProxy);
......
/*
* $LynxId: HTAAUtil.h,v 1.12 2010/06/17 00:36:04 tom Exp $
* $LynxId: HTAAUtil.h,v 1.13 2010/10/27 00:09:52 tom Exp $
*
* Utilities for the Authorization parts of libwww
* COMMON PARTS OF AUTHORIZATION MODULE TO BOTH SERVER AND BROWSER
......@@ -48,7 +48,8 @@ extern "C" {
#define MAX_FIELDNAME_LEN 16 /* @@ Longest field name in */
/* protection setup file */
#define MAX_PATHNAME_LEN 80 /* @@ Longest passwd/group file */
/* pathname to allow *//*
/* pathname to allow */
/*
Datatype definitions
......
/*
* $LynxId: HTFTP.c,v 1.98 2010/09/25 00:05:51 tom Exp $
* $LynxId: HTFTP.c,v 1.99 2010/10/31 17:56:13 tom Exp $
*
* File Transfer Protocol (FTP) Client
* for a WorldWideWeb browser
......@@ -133,7 +133,7 @@ typedef struct _connection {
#elif defined(SYS_HPUX)
# if defined(_XOPEN_SOURCE_EXTENDED) && defined(SO_PROTOTYPE)
# define LY_SOCKLEN socklen_t
# else /* HPUX 10.20, etc. */
# else /* HPUX 10.20, etc. */
# define LY_SOCKLEN int
# endif
#elif defined(SYS_TRU64)
......
/*
* $LynxId: HTFile.c,v 1.126 2010/09/24 08:52:55 tom Exp $
* $LynxId: HTFile.c,v 1.127 2010/10/27 00:10:02 tom Exp $
*
* File Access HTFile.c
* ===========
......@@ -31,7 +31,8 @@
#define LONG_LIST /* Define this for long style unix listings (ls -l),
the actual style is configurable from lynx.cfg */
#endif
/* #define NO_PARENT_DIR_REFERENCE *//* Define this for no parent links */
/* #define NO_PARENT_DIR_REFERENCE */
/* Define this for no parent links */
#endif /* !VMS */
#if defined(DOSPATH)
......
/*
* $LynxId: HTFormat.c,v 1.72 2010/09/24 09:11:25 tom Exp $
* $LynxId: HTFormat.c,v 1.73 2010/11/07 21:20:56 tom Exp $
*
* Manage different file formats HTFormat.c
* =============================
......@@ -1089,7 +1089,7 @@ static int HTGzFileCopy(gzFile gzfp, HTStream *sink)
(*targetClass.put_block) (sink, input_buffer, status);
bytes += status;
HTReadProgress(bytes, (off_t) - 1);
HTReadProgress(bytes, (off_t) -1);
HTDisplayPartial();
if (HTCheckForInterrupt()) {
......@@ -1191,7 +1191,7 @@ static int HTZzFileCopy(FILE *zzfp, HTStream *sink)
if (len > 0) {
(*targetClass.put_block) (sink, output_buffer, len);
bytes += len;
HTReadProgress(bytes, (off_t) - 1);
HTReadProgress(bytes, (off_t) -1);
HTDisplayPartial();
}
rv = HT_LOADED;
......@@ -1220,7 +1220,7 @@ static int HTZzFileCopy(FILE *zzfp, HTStream *sink)
(*targetClass.put_block) (sink, output_buffer, len);
bytes += len;
HTReadProgress(bytes, (off_t) - 1);
HTReadProgress(bytes, (off_t) -1);
HTDisplayPartial();
if (HTCheckForInterrupt()) {
......@@ -1295,7 +1295,7 @@ static int HTBzFileCopy(BZFILE * bzfp, HTStream *sink)
(*targetClass.put_block) (sink, input_buffer, status);
bytes += status;
HTReadProgress(bytes, (off_t) - 1);
HTReadProgress(bytes, (off_t) -1);
HTDisplayPartial();
if (HTCheckForInterrupt()) {
......
/*
* $LynxId: HTFormat.h,v 1.32 2010/09/25 11:42:03 tom Exp $
* $LynxId: HTFormat.h,v 1.33 2010/10/27 00:13:53 tom Exp $
*
* HTFormat: The format manager in the WWW Library
* MANAGE DIFFERENT DOCUMENT FORMATS
......@@ -44,7 +44,11 @@ extern "C" {
useful for diagnostics, and for users who want to see the original, whatever
it is.
*//* Internal ones *//* #define WWW_SOURCE HTAtom_for("www/source") *//* Whatever it was originally */ extern HTAtom *WWW_SOURCE;
*/
/* Internal ones */
/* #define WWW_SOURCE HTAtom_for("www/source") */
/* Whatever it was originally */
extern HTAtom *WWW_SOURCE;
/* calculated once, heavy used */
/*
......
/*
* $LynxId: HTNews.c,v 1.66 2010/09/25 00:42:40 tom Exp $
* $LynxId: HTNews.c,v 1.67 2010/10/27 00:10:51 tom Exp $
*
* NEWS ACCESS HTNews.c
* ===========
......@@ -94,7 +94,6 @@ static int s; /* Socket for NewsHost */
static int HTCanPost = FALSE; /* Current POST permission */
static char response_text[LINE_LENGTH + 1]; /* Last response */
/* static HText * HT; *//* the new hypertext */
static HTStructured *target; /* The output sink */
static HTStructuredClass targetClass; /* Copy of fn addresses */
static HTStream *rawtarget = NULL; /* The output sink for rawtext */
......
/*
* $LynxId: HTString.c,v 1.64 2010/09/25 11:32:30 tom Exp $
* $LynxId: HTString.c,v 1.65 2010/11/07 21:20:58 tom Exp $
*
* Case-independent string comparison HTString.c
*
......@@ -777,6 +777,7 @@ PUBLIC_IF_FIND_LEAKS char *StrAllocVsprintf(char **pstr,
else if (type == 'Z')
VA_INTGR(size_t);
else
VA_INTGR(int);
......
/*
* $LynxId: HTTCP.c,v 1.104 2010/09/25 11:32:53 tom Exp $
* $LynxId: HTTCP.c,v 1.106 2010/11/07 21:20:58 tom Exp $
*
* Generic Communication Code HTTCP.c
* ==========================
......@@ -77,9 +77,6 @@ static char *hostname = NULL; /* The name of this host */
unsigned long socks_bind_remoteAddr; /* for long Rbind */
#endif /* SOCKS */
/* PUBLIC SockA HTHostAddress; *//* The internet address of the host */
/* Valid after call to HTHostName() */
/* Encode INET status (as in sys/errno.h) inet_status()
* ------------------
*
......@@ -2105,7 +2102,7 @@ int HTDoRead(int fildes,
#ifdef USE_READPROGRESS
CTRACE2(TRACE_TIMING, (tfp, "...HTDoRead returns %d (%" PRI_time_t
" seconds)\n",
result, CAST_time_t(time((time_t *) 0) - start)));
result, CAST_time_t (time((time_t *)0) - start)));
#endif
return result;
}
......
/*
* $LynxId: HTTP.c,v 1.120 2010/09/25 11:31:46 tom Exp $
* $LynxId: HTTP.c,v 1.121 2010/11/07 21:20:58 tom Exp $
*
* HyperText Tranfer Protocol - Client implementation HTTP.c
* ==========================
......@@ -170,6 +170,7 @@ void HTSSLInitPRNG(void)
}
/* Seed in time (mod_ssl does this) */
RAND_seed((unsigned char *) &t, (int) sizeof(time_t));
/* Seed in pid (mod_ssl does this) */
RAND_seed((unsigned char *) &pid, (int) sizeof(pid));
/* Initialize system's random number generator */
......@@ -1048,12 +1049,12 @@ static int HTLoadHTTP(const char *arg,
if (pres->quality < 1.0) {
if (pres->maxbytes > 0) {
sprintf(temp, ";q=%4.3f;mxb=%" PRI_off_t "",
pres->quality, CAST_off_t(pres->maxbytes));
pres->quality, CAST_off_t (pres->maxbytes));
} else {
sprintf(temp, ";q=%4.3f", pres->quality);
}
} else if (pres->maxbytes > 0) {
sprintf(temp, ";mxb=%" PRI_off_t "", CAST_off_t(pres->maxbytes));
sprintf(temp, ";mxb=%" PRI_off_t "", CAST_off_t (pres->maxbytes));
} else {
temp[0] = '\0';
}
......
/*
* $LynxId: HTUtils.h,v 1.102 2010/09/25 15:32:56 tom Exp $
* $LynxId: HTUtils.h,v 1.103 2010/10/27 00:08:52 tom Exp $
*
* Utility macros for the W3 code library
* MACROS FOR GENERAL USE
......@@ -157,12 +157,12 @@ char *alloca();
#define LY_MAXPATH 256
#endif
#ifndef GCC_NORETURN
#define GCC_NORETURN /* nothing */
#ifndef GCC_NORETURN
#define GCC_NORETURN /* nothing */
#endif
#ifndef GCC_UNUSED
#define GCC_UNUSED /* nothing */
#ifndef GCC_UNUSED
#define GCC_UNUSED /* nothing */
#endif
#if defined(__GNUC__) && defined(_FORTIFY_SOURCE)
......
/*
* $LynxId: HTVMS_WaisUI.c,v 1.16 2010/09/25 00:32:18 tom Exp $
* $LynxId: HTVMS_WaisUI.c,v 1.17 2010/10/29 21:10:14 tom Exp $
* HTVMS_WAISUI.c
*
* Adaptation for Lynx by F.Macrides (macrides@sci.wfeb.edu)
......@@ -695,7 +695,7 @@ SearchAPDU *makeSearchAPDU(long small,
query->DatabaseNames = (char **) s_realloc((char *) query->DatabaseNames,
(size_t) (sizeof(char
*) *
(i + 2)));
(i + 2)));
query->DatabaseNames[i] = s_strdup(ptr);
query->DatabaseNames[i + 1] = NULL;
......@@ -713,7 +713,7 @@ SearchAPDU *makeSearchAPDU(long small,
query->ElementSetNames = (char **) s_realloc((char *) query->ElementSetNames,
(size_t) (sizeof(char
*) *
(i + 2)));
(i + 2)));
query->ElementSetNames[i] = s_strdup(ptr);
query->ElementSetNames[i + 1] = NULL;
......
......@@ -39,15 +39,23 @@ extern "C" {
#define exit(code) LYexit(code)
#define atexit LYatexit
#define ATEXITSIZE 50
/*
* Data structures
*//*
* Global variable declarations
*//*
* Macros
*//*
* Function declarations
*/ extern void outofmem(const char *fname, const char *func);
*/
/*
* Global variable declarations
*/
/*
* Macros
*/
/*
* Function declarations
*/
extern void outofmem(const char *fname, const char *func);
extern void reset_signals(void);
extern void exit_immediately(int status) GCC_NORETURN;
extern void LYexit(int status) GCC_NORETURN;
......
/*
* $LynxId: SGML.c,v 1.140 2010/10/04 00:04:12 tom Exp $
* $LynxId: SGML.c,v 1.142 2010/12/10 01:46:10 tom Exp $
*
* General SGML Parser code SGML.c
* ========================
......@@ -42,7 +42,7 @@
#define AssumeCP1252(context) \
(((context)->inUCLYhndl == LATIN1 \
|| (context)->inUCLYhndl == US_ASCII) \
&& !(context)->extended_html)
&& html5_charsets)
#define INVALID (-1)
......@@ -2153,7 +2153,7 @@ static void SGML_character(HTStream *context, int c_in)
uck < 256) {
CTRACE((tfp, "UCTransUniChar returned 0x%.2" PRI_UCode_t
":'%c'.\n",
uck, FROMASCII((char) uck)));
uck, FROMASCII((char)uck)));
/*
* We got one octet from the conversions, so use it. - FM
*/
......
/*
* $LynxId: UCAux.h,v 1.17 2010/09/24 00:14:04 tom Exp $
* $LynxId: UCAux.h,v 1.18 2010/11/07 21:20:59 tom Exp $
*/
#ifndef UCAUX_H
#define UCAUX_H
......@@ -59,11 +59,11 @@ extern "C" {
int vert_in,
int hori_in);
typedef void putc_func_t(HTStream *me,
int ch);
typedef void putc_func_t (HTStream *me,
int ch);
extern BOOL UCPutUtf8_charstring(HTStream *target,
putc_func_t * actions,
putc_func_t *actions,
UCode_t code);
extern BOOL UCConvertUniToUtf8(UCode_t code,
......
/*
* $LynxId: tidy_tls.h,v 1.1 2008/04/27 22:50:39 tom Exp $
* $LynxId: tidy_tls.h,v 1.2 2010/10/27 00:07:26 tom Exp $
* Copyright 2008, Thomas E. Dickey
*/
#ifndef TIDY_TLS_H
......@@ -103,7 +103,7 @@ struct _SSL {
/* use either SSL_VERIFY_NONE or SSL_VERIFY_PEER, the last 2 options
* are 'ored' with SSL_VERIFY_PEER if they are desired */
#define SSL_VERIFY_PEER 0x01
/* *INDENT-OFF* */
extern SSL *SSL_new(SSL_CTX * ctx);
extern SSL_CIPHER *SSL_get_current_cipher(SSL * ssl);
extern SSL_CTX *SSL_CTX_new(SSL_METHOD * method);
......@@ -134,5 +134,6 @@ extern void SSL_CTX_free(SSL_CTX * ctx);
extern void SSL_CTX_set_verify(SSL_CTX * ctx, int verify_mode, int (*verify_callback) (int, X509_STORE_CTX *));
extern void SSL_free(SSL * ssl);
extern void SSL_load_error_strings(void);
/* *INDENT-ON* */
#endif /* TIDY_TLS_H */
/* System dependencies in the W3 library
* $LynxId: www_tcp.h,v 1.45 2010/09/25 16:24:45 tom Exp $
* $LynxId: www_tcp.h,v 1.47 2010/10/31 17:56:16 tom Exp $
*
SYSTEM DEPENDENCIES
......@@ -159,7 +159,8 @@ extern const unsigned char IBM1047[];
/* For debugging
#include <assert.h>
#define TOASCII(c) (assert((c)>=0 && (c)<256), un_IBM1047[c])
*//* for production */
*/
/* for production */
#define TOASCII(c) (un_IBM1047[c])
#define FROMASCII(c) (IBM1047[c])
......@@ -746,10 +747,10 @@ typedef unsigned short mode_t;
# ifdef HAVE_LIMITS_H
# include <limits.h>
# endif /* HAVE_LIMITS_H */
# endif /* HAVE_LIMITS_H */
# if !defined(MAXINT) && defined(INT_MAX)
# define MAXINT INT_MAX
# endif /* !MAXINT && INT_MAX */
# endif /* !MAXINT && INT_MAX */
#else
......
This diff is collapsed.
This diff is collapsed.
......@@ -4,7 +4,7 @@
# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
# Free Software Foundation, Inc.
timestamp='2009-12-31'
timestamp='2010-09-11'
# This file is (in principle) common to ALL GNU software.
# The presence of a machine in this file suggests that SOME GNU software
......@@ -124,8 +124,9 @@ esac
# Here we must recognize all the valid KERNEL-OS combinations.
maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
case $maybe_os in
nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
knetbsd*-gnu* | netbsd*-gnu* | \
kopensolaris*-gnu* | \
storm-chaos* | os2-emx* | rtmk-nova*)
os=-$maybe_os
......@@ -157,8 +158,8 @@ case $os in
os=
basic_machine=$1
;;
-bluegene*)
os=-cnk
-bluegene*)
os=-cnk
;;
-sim | -cisco | -oki | -wec | -winbond)
os=
......@@ -282,6 +283,7 @@ case $basic_machine in
| moxie \
| mt \