The following patch tries to clean up some of the loose ends,
primarily in documentation. A Russian user pointed out that the DOS
binary was ignoring character 0xe0. This turned out to be a bug in the
PDCurses code for DOS. I modified the INSTALLATION file to reflect
the patch to PDCurses. I also included the file for the public domain
release of the CERN wwwlib code. I would recommend removing completely
the files WWW/Copyright.txt and WWW/README; I don't see where they
add any information relevent to the lynx code. Other changes fix dead
links, Y2K changes, and reflect newer versions of other programs.
Doug
--- WWW/FreeofCharge.html Wed Mar 1 00:15:10 2000
+++ WWW/FreeofCharge.html.new Wed Mar 1 00:15:10 2000
@@ -0,0 +1,26 @@
+<!-- X-URL: http://www.w3.org/History/1993/WWW/Conditions/old/FreeofCharge.html -->
+<BASE HREF="http://www.w3.org/History/1993/WWW/Conditions/old/FreeofCharge.html">
+
+<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
+
+<HTML><HEAD><TITLE>
+CERN WWW software freely available</TITLE><NEXTID N="z9"></HEAD><BODY><H1>
+Software freely available</H1>The following CERN software is hereby put into
+the public domain.
+<UL>
+<LI>WWW basic ("line-mode") client <LI>WWW basic server <LI>WWW Library of
+common code.</UL>CERN relinquishes all intellectual property rights to this
+code, both source and binary form and permission is granted for anyone to use,
+duplicate,
+modify and redistribute it.<P>CERN provides absolutely NO WARRANTY OF ANY KIND
+with respect to this software.
+The entire risk as to the quality and performance of this software is with the
+user.
+IN NO EVENT WILL CERN BE LIABLE TO ANYONE FOR ANY DAMAGES ARISING OUT THE USE
+OF THIS SOFTWARE, INCLUDING, WITHOUT LIMITATION,
+DAMAGES RESULTING FROM LOST DATA OR LOST PROFITS, OR FOR ANY SPECIAL,
+INCIDENTAL OR CONSEQUENTIAL DAMAGES.<P>This is part of the <A
+HREF="Introduction.html" NAME="z8">
+CERN WWW</A> distribution condidtions.<P>Declaration to this effect signed by
+the CERN directors of Administration (H. Weber) and Research (W.
+Hoogland), May 1993.</BODY></HTML>
--- INSTALLATION Fri Feb 25 04:38:36 2000
+++ INSTALLATION.new Fri Mar 3 22:59:40 2000
@@ -722,13 +722,16 @@
and either type the command:
"stubedit cc1.exe bufsize=63k minstack=2M",
or edit interactively with: "stubedit cc1.exe".
+ The requirements for compiling with optimization using DJGPP 2.03
+ and GCC 2.95.2 have not yet been fully investigated. The above
+ should serve as a guide.
Unpack the source code using a DOS program like UNZIP386. If you are
using PKUNZIP to unpack the .zip archive, you must use the -d command
line switch to restore the directory structure contained in the archive,
i.e., do "pkunzip -d lynx-cur.zip". No switch is required if you use
unzip386 or unzip. If you are trying to compile the 386DOS port under a
- Win95/NT DOS shell, be sure to unpack the source with a DOS program so
+ WinNT DOS shell, be sure to unpack the source with a DOS program so
that all directories will be adjusted to the DOS 8.3 file format necessary
for compiling with DJGPP. Do NOT use Winzip, because that will create
long filenames that will not be recognized by DJGPP tools.
@@ -745,41 +748,43 @@
is available at "http://www.bgnett.no/~giva/". You can also
use slang ("ftp://space.mit.edu/pub/davis/slang") as your curses
library. You need to compile these before you go any further. If
- you wish to use PDCurses 2.3, you need to first apply the following
+ you wish to use PDCurses 2.4, you need to first apply the following
patch:
-*** curses.h Fri Jul 10 11:24:28 1998
---- curses.h.new Mon Dec 6 22:46:08 1999
-***************
-*** 1802,1807 ****
---- 1802,1809 ----
- #define getbegx(w) (w)->_begx
- #define getbegy(w) (w)->_begy
- #define getbegyx(w,y,x) ( y = (w)->_begy, x = (w)->_begx )
-+ #define getbkgd(w) ((w)->_bkgd)
-+ #define getattrs(win) ((win)->_attrs)
- #define getch() wgetch(stdscr)
- #define getmaxx(w) (w)->_maxx
- #define getmaxy(w) (w)->_maxy
-*** dos/pdckbd.c Sat Jul 12 17:10:12 1997
---- dos/pdckbd.c.new Thu Apr 15 20:52:16 1999
-***************
-*** 443,449 ****
- _watch_breaks();
- #else
- # ifdef GO32
-! (void*)signal(SIGINT,(setting ? SIG_DFL : SIG_IGN));
- /* __djgpp_set_ctrl_c(setting);*/
- setcbrk(setting);
- # else
---- 443,449 ----
- _watch_breaks();
- #else
- # ifdef GO32
-! /* (void*)signal(SIGINT,(setting ? SIG_DFL : SIG_IGN)); */
- /* __djgpp_set_ctrl_c(setting);*/
- setcbrk(setting);
- # else
+ --- curses.h.ori Mon Jan 17 13:35:36 2000
+ +++ curses.h Fri Mar 3 00:18:30 2000
+ @@ -1949,9 +1949,11 @@
+ #define echochar(c) (addch((chtype)c)==ERR?ERR:refresh())
+ #define erase() werase( stdscr )
+ #define fixterm() reset_prog_mode()
+ +#define getattrs(w) (w)->_attrs
+ #define getbegx(w) (w)->_begx
+ #define getbegy(w) (w)->_begy
+ #define getbegyx(w,y,x) ( y = (w)->_begy, x = (w)->_begx )
+ +#define getbkgd(w) (w)->_bkgd
+ #define getch() wgetch(stdscr)
+ #define getmaxx(w) (w)->_maxx
+ #define getmaxy(w) (w)->_maxy
+ --- dos/pdckbd.c.ori Sun Dec 26 23:15:04 1999
+ +++ dos/pdckbd.c Fri Mar 3 00:20:14 2000
+ @@ -336,7 +336,7 @@
+ || (scan == 0x4e && ascii == 0x2b) /* Plus */
+ || (scan == 0xe0 && ascii == 0x2f)) /* Slash */
+ return ((int) ((ascii & 0x0f) | 0xf0) << 8);
+ - if (ascii == 0x00 || ascii == 0xe0)
+ + if (ascii == 0x00 || (ascii == 0xe0 && scan != 0x00))
+ return ((int) (scan << 8));
+ return ((int) (ascii));
+ }
+ @@ -496,7 +496,7 @@
+ _watch_breaks();
+ #else
+ # ifdef GO32
+ - (void*)signal(SIGINT,(setting ? SIG_DFL : SIG_IGN));
+ +/* (void*)signal(SIGINT,(setting ? SIG_DFL : SIG_IGN)); */
+ /* __djgpp_set_ctrl_c(setting);*/
+ setcbrk(setting);
+ # else
If you have trouble applying the patch, try using the "patch" program,
("http://www.simtel.net/pub/simtelnet/gnu/djgpp/v2gnu/pat25b.zip").
@@ -810,7 +815,7 @@
If you wish to compile with support for internationalization of messages,
you first need to install the DOS port of the GNU gettext package,
available from any DJGPP mirror site. You may wish to recompile with DJGPP
- 2.02. Then uncomment the lines for INTLFLAGS in src/makefile.dsl and in
+ 2.03. Then uncomment the lines for INTLFLAGS in src/makefile.dsl and in
WWW/Library/djgpp/makefile.sla, and remove the "#" from the LIBS line in
src/makefile.dsl. Make similar changes if using one of the other DOS
makefiles. See the gettext documentation for information on creating and
@@ -823,7 +828,7 @@
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/month0198/msg00057.html".
+ "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 "http://www.simtel.net/pub/simtelnet/msdos/pktdrvr/pktd11.zip".
@@ -838,7 +843,7 @@
"http://mvmpc9.ciw.uni-karlsruhe.de/c:/user/toni/dosppp/dosppp06.zip",
"http://personal.redestb.es/tonilop/dosppp/dosppp06.zip", or
"ftp://ftp.agate.net/users/01935/internet/dosppp06.zip";
- "ftp://ftp.klos.com/demo/pppshare.exe".)
+ "http://www.klos.com/get.pppshare.html")
File access looks like this:
@@ -849,17 +854,18 @@
file://localhost/c:/dos
file://localhost/c:/dos/command.com
- See "http://www.fdisk.com/doslynx/lynxport.htm" for more hints and some
- precompiled libraries. One problem you can run into is when editing
- userdefs.h and lynx.cfg, which have unix-style end of lines. You would be
- well advised to use an editor that can handle end of lines terminated with
- a single LF character. You can also unpack the source code using unzip386
- or unzip with the -a switch to convert unix LF to dos CRLF. That will make
- texts more readable under DOS. If you compile lynx regularly, you may
- automate the procedure by creating a batch file such as the following.
+ See "http://www.fdisk.com/doslynx/lynxport.htm" for more hints and
+ some precompiled libraries. One problem you can encounter is editing
+ userdefs.h and lynx.cfg, which have unix-style end of lines. You would
+ be well advised to use an editor that can handle end of lines terminated
+ with a single LF character. You can also unpack the source code using
+ unzip386 or unzip with the -a switch to convert unix LF to dos CRLF.
+ That will make texts more readable under DOS. If you compile lynx
+ regularly, you may automate the procedure by creating a batch file such
+ as the following.
cd djgpp\watt32\src
- build djgpp
+ configur djgpp
make -f djgpp.mak
cd ..\..\..\www\library\djgpp
make
@@ -874,18 +880,18 @@
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/month1197/msg00250.html".
+ "http://www.flora.org/lynx-dev/html/month111997/msg00250.html".
-- 1997/9/29 - D. Kaufman <[EMAIL PROTECTED]>
-- 1997/10/3 - B. Schiavo <[EMAIL PROTECTED]>
--- Last update - 2000/01/15
+-- Last update - 2000/03/03
VI. General installation instructions
Once you have compiled Lynx, test it out first on a local file. Be sure
Lynx can find lynx.cfg. A _sample_ test command line would be:
- `lynx -cfg=/usr/local/lib/lynx.cfg .`. Once you are satisfied that
+ 'lynx -cfg=/usr/local/lib/lynx.cfg .'. Once you are satisfied that
Lynx works, go ahead and install it. For Unix, type "make install".
For VMS, you need to have the executable in a public place, make it
@@ -932,7 +938,7 @@
setting in config.sys. In addition, lynx looks for a "SHELL" environment
variable when shelling to DOS. If you wish to preserve the environment
space when shelling, put a line like this in your AUTOEXEC.BAT file also
- "SET SHELL=C:\COMMAND.COM /E:2048". It should match CONFIG.SYS.
+ "SET SHELL=C:\COMMAND.COM /E:4096". It should match CONFIG.SYS.
HOME Where to keep the bookmark file and personal config files.
TEMP or TMP Bookmarks are kept here with no HOME. Temp files here.
--- lynx.cfg Fri Feb 25 04:38:36 2000
+++ lynx.cfg.new Fri Mar 3 00:06:04 2000
@@ -612,7 +612,7 @@
# Showing the cursor is handy if you are a sighted user with a poor
# terminal that can't do bold and reverse video at the same time or
# at all. It also can be useful to blind users, as an alternative
-# or supplement to setting LINKS_AND_FORM_FIELDS_ARE_NUMBERED or
+# or supplement to setting LINKS_AND_FIELDS_ARE_NUMBERED or
# LINKS_ARE_NUMBERED.
# The default defined here or in userdefs.h can be changed via the
# 'o'ptions menu and saved in the RC file, and always can be toggled
@@ -1268,7 +1268,7 @@
# numbers work like arrows or numbered links.
# Set to TRUE, indicates numbers act as arrows,
# and set to FALSE indicates numbers refer to numbered links on the page.
-# LINKS_AND_FORM_FIELDS_ARE_NUMBERED cannot be set by this option because
+# LINKS_AND_FIELDS_ARE_NUMBERED cannot be set by this option because
# it allows only two values (true and false).
#
#DEFAULT_KEYPAD_MODE_IS_NUMBERS_AS_ARROWS:TRUE
--- src/chrtrans/makefile.dos Sat Aug 28 13:04:14 1999
+++ src/chrtrans/makefile.dos.new Fri Mar 3 01:06:22 2000
@@ -12,7 +12,7 @@
CFLAGS = $(MCFLAGS)
CC = gcc
-MCFLAGS = -O3 -DDOSPATH -DNO_TTYTYP \
+MCFLAGS = -O1 -DDOSPATH -DNO_TTYTYP \
-I. \
-I../../WWW/Library/Implementation \
-I../../djgpp/watt32/inc \
--- userdefs.h Fri Feb 25 04:38:36 2000
+++ userdefs.h.new Fri Mar 3 00:02:12 2000
@@ -348,7 +348,7 @@
* upgrade, because anonymous mail makes it far too easy for a user to
* spoof someone else's email address.)
*/
-#define NO_ANONYMOUS_EMAIL TRUE
+/*#define NO_ANONYMOUS_EMAIL TRUE */
/********************************
* LIST_FORMAT defines the display for local files when LONG_LIST
__
Doug Kaufman
Internet: [EMAIL PROTECTED]
