[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
LYNX-DEV LYNX_386 - Bug fixes for lynx.2.7.1ac-0.30
|
From: |
Doug Kaufman |
|
Subject: |
LYNX-DEV LYNX_386 - Bug fixes for lynx.2.7.1ac-0.30 |
|
Date: |
Fri, 4 Jul 1997 19:06:04 -0700 (PDT) |
I don't know if anyone is still interested in lynx for DOS, but I thought
that I would report the following problems. With the binary that Wayne
has been distributing (based on ac-0.20), the SHELL environment variable
is ignored. In addition a ^C or ctrl-BREAK while in a shell or a helper
application (e.g. telnet), causes lynx to abort as soon as the other
activity terminates. I have compiled lynx with DJGPP using the ac-0.30
development code and PDCURSES-2.3(beta)(28May1997 version). With the
following changes, the above problems seem to be fixed and the EXTERNAL
setting is working (enabling FTP while in lynx). The problem with
brightcyan has been fixed. I haven't been able to get CHARTRANS working
yet.
Another problem for DOS is the filenames. With the 8+3 limitation of
DOS, about_lynx.html and about_lynx-dev.html get shortened to the same
filename. I changed the latter to lynx-dev.html so that the references
in the helpfiles can work under DOS.
Unfortunately, I don't know C programming, so the changes are mostly
empiric. Please let me know if any of these changes breaks anything.
Particularly, see the change leaving "no_color_video" set to -1 in
LYCurses.c. I wasn't sure if this should be defined otherwise for DOS.
Some of the lines in the patch are long. If they get mangled by a
mailer along the way, I can send a mime encoded or uuencoded set.
Pdcurses is available from "ftp://ftp.qut.edu.au/pub/markh/PDCurses";.
The patch for pdcurses is:
*** lynx2-7-1/djgpp/pdcurses/pdcurses/getch.c Wed Jul 2 21:45:38 1997
--- lynx2-7-1/djgpp/pdcurses/pdcurses/getch.c.new Wed Jul 2 21:45:40 1997
***************
*** 114,119 ****
--- 114,120 ----
/* this define to get around DOS libraries conflict */
#define getch PDC_getch
+ #define ungetch PDC_ungetch
/***********************************************************************/
#ifdef HAVE_PROTO
int PDC_CDECL PDC_getch(void)
***************
*** 369,377 ****
}
/***********************************************************************/
#ifdef HAVE_PROTO
! int PDC_CDECL ungetch(int ch)
#else
! int PDC_CDECL ungetch(ch)
int ch;
#endif
/***********************************************************************/
--- 370,378 ----
}
/***********************************************************************/
#ifdef HAVE_PROTO
! int PDC_CDECL PDC_ungetch(int ch)
#else
! int PDC_CDECL PDC_ungetch(ch)
int ch;
#endif
/***********************************************************************/
*** lynx2-7-1/djgpp/pdcurses/dos/pdckbd.c Wed Jul 2 21:45:44 1997
--- lynx2-7-1/djgpp/pdcurses/dos/pdckbd.c.new Wed Jul 2 21:45:46 1997
***************
*** 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
The patch for lynx2.7.1ac-0.30 is:
*** lynx2-7-1/about_lynx/about_lynx.html Mon Feb 24 17:10:14 1997
--- lynx2-7-1/about_lynx/about_lynx.html.new Wed Jul 2 22:14:06 1997
***************
*** 7,13 ****
<BODY>
<BANNER>
! [ <A HREF="about_lynx-dev.html">About Lynx-Dev</A> |
<A HREF="http://www.flora.org/lynx-dev/html/";>Lynx-Dev Archives</A> ]
</BANNER>
--- 7,13 ----
<BODY>
<BANNER>
! [ <A HREF="lynx-dev.html">About Lynx-Dev</A> |
<A HREF="http://www.flora.org/lynx-dev/html/";>Lynx-Dev Archives</A> ]
</BANNER>
***************
*** 89,95 ****
We have a listserv mailing list running for lynx development discussion.
If you are interested in joining the list, follow this <A
! HREF="about_lynx-dev.html">link</A>. There also are links to <A
HREF="http://www.flora.org/lynx-dev/html/";>archives</A> in html
format for this mailing list.
--- 89,95 ----
We have a listserv mailing list running for lynx development discussion.
If you are interested in joining the list, follow this <A
! HREF="lynx-dev.html">link</A>. There also are links to <A
HREF="http://www.flora.org/lynx-dev/html/";>archives</A> in html
format for this mailing list.
*** lynx2-7-1/WWW/djgpp/CommonMakefile Wed Apr 9 05:19:20 1997
--- lynx2-7-1/WWW/djgpp/CommonMakefile.new Tue Jul 1 00:52:26 1997
***************
*** 33,47 ****
# .h files are distributed but originally are made from the
# self-documenting hypertext files.
! .SUFFIXES: .h .html
.html.h:
# - chmod +w $*.h
! www -w90 -na -to text/x-c $*.html > $*.h
# chmod -w $*.h
# If this is actually run in a subdirectory,
#
! # WWW = ../../..
# WWW = ../.. For [cernlib] build in this directory
WC = $(WWW)/Library
--- 33,47 ----
# .h files are distributed but originally are made from the
# self-documenting hypertext files.
! .SUFFIXES: .h .html .htm
.html.h:
# - chmod +w $*.h
! # www -w90 -na -to text/x-c $*.html > $*.h
# chmod -w $*.h
# If this is actually run in a subdirectory,
#
! WWW = ../..
# WWW = ../.. For [cernlib] build in this directory
WC = $(WWW)/Library
***************
*** 146,152 ****
# Clean up everything generatable except final products
clean :
! rm $(LOB)/*.o $(LOB)/.created
-rmdir $(LOB)
# Clean up everything generatable including final products
--- 146,152 ----
# Clean up everything generatable except final products
clean :
! rm $(LOB)/*.o $(LOB)/created
-rmdir $(LOB)
# Clean up everything generatable including final products
***************
*** 212,220 ****
# Common code
# -----------
! # Directory for object files - .created checks it exists
! OE = $(LOB)/.created
$(OE) :
if [ ! -r $(WTMP) ] ; then mkdir $(WTMP); else echo OK ; fi
if [ ! -r $(WTMP)/Library ] ; then mkdir $(WTMP)/Library; else echo OK
; fi
--- 212,220 ----
# Common code
# -----------
! # Directory for object files - created checks it exists
! OE = $(LOB)/created
$(OE) :
if [ ! -r $(WTMP) ] ; then mkdir $(WTMP); else echo OK ; fi
if [ ! -r $(WTMP)/Library ] ; then mkdir $(WTMP)/Library; else echo OK
; fi
*** lynx2-7-1/src/GridText.c
--- lynx2-7-1/src/GridText.c.new
***************
*** 198,208 ****
HTStream* target; /* Output stream */
HTStreamClass targetClass; /* Output routines */
#ifdef EXP_CHARTRANS
LYUCcharset * UCI; /* pointer to node_anchor's UCInfo */
int UCLYhndl; /* tells us what charset we are fed */
UCTransParams T;
- BOOL have_8bit_chars; /* Any non-ASCII characters? */
#endif
};
--- 198,208 ----
HTStream* target; /* Output stream */
HTStreamClass targetClass; /* Output routines */
+ BOOL have_8bit_chars; /* Any non-ASCII characters? */
#ifdef EXP_CHARTRANS
LYUCcharset * UCI; /* pointer to node_anchor's UCInfo */
int UCLYhndl; /* tells us what charset we are fed */
UCTransParams T;
#endif
};
*** lynx2-7-1/WWW/Library/Implementation/HTTelnet.c Sat Apr 26 19:45:52 1997
--- lynx2-7-1/WWW/Library/Implementation/HTTelnet.c.new Mon Jun 30 22:46:04 1997
***************
*** 163,168 ****
--- 163,172 ----
/* Most unix machines suppport username only with rlogin */
#if defined(unix) || defined(DOSPATH)
+ #ifdef __DJGPP__
+ __djgpp_set_ctrl_c(0);
+ _go32_want_ctrl_break(1);
+ #endif /* __DJGPP__ */
#ifndef TELNET_DONE
if (login_protocol == rlogin) {
sprintf(command, "%s %s%s%s", RLOGIN_COMMAND,
***************
*** 187,192 ****
--- 191,200 ----
return HT_NO_DATA; /* Ok - it was done but no data */
#define TELNET_DONE
#endif /* !TELNET_DONE */
+ #ifdef __DJGPP__
+ __djgpp_set_ctrl_c(1);
+ _go32_want_ctrl_break(0);
+ #endif /* __DJGPP__ */
#endif /* unix */
/* VMS varieties */
*** lynx2-7-1/src/LYCurses.c
--- lynx2-7-1/src/LYCurses.c.new
***************
*** 396,405 ****
have_underline = 1;
#endif /* DOSPATH */
}
!
if (no_color_video < 0) {
no_color_video = tigetnum("ncv");
}
if (Current_Attr & A_BOLD)
code |= 1;
--- 396,406 ----
have_underline = 1;
#endif /* DOSPATH */
}
! #ifndef __DJGPP__
if (no_color_video < 0) {
no_color_video = tigetnum("ncv");
}
+ #endif /* __DJGPP__ */
if (Current_Attr & A_BOLD)
code |= 1;
*** lynx2-7-1/src/LYDownload.c Thu Jun 26 19:08:52 1997
--- lynx2-7-1/src/LYDownload.c.new Fri Jul 4 17:22:34 1997
***************
*** 569,575 ****
--- 569,577 ----
HTAlert(CANNOT_OPEN_TEMP);
return(-1);
}
+ #ifndef __DJGPP__
chmod(tempfile, 0600);
+ #endif /* __DJGPP__ */
LYstrncpy(LYValidDownloadFile,
data_file,
*** LYExtern.c Wed Apr 30 19:10:02 1997
--- LYExtern.c.new Fri Jul 4 14:06:10 1997
***************
*** 73,79 ****
--- 73,87 ----
stop_curses();
fflush(stdout);
+ #ifdef __DJGPP__
+ __djgpp_set_ctrl_c(0);
+ _go32_want_ctrl_break(1);
+ #endif /* __DJGPP__ */
system(command);
+ #ifdef __DJGPP__
+ __djgpp_set_ctrl_c(1);
+ _go32_want_ctrl_break(0);
+ #endif /* __DJGPP__ */
fflush(stdout);
start_curses();
}
*** lynx2-7-1/src/LYMainLoop.c
--- lynx2-7-1/src/LYMainLoop.c.new
***************
*** 4094,4100 ****
#ifdef DOSPATH
system("cls");
system("echo Type EXIT to return to Lynx.");
! system(getenv("COMSPEC") == NULL ? "command.com" : getenv("COMSPEC"));
#else
#ifdef VMS
system("");
--- 4094,4112 ----
#ifdef DOSPATH
system("cls");
system("echo Type EXIT to return to Lynx.");
! #ifdef __DJGPP__
! __djgpp_set_ctrl_c(0);
! _go32_want_ctrl_break(1);
! #endif /* __DJGPP__ */
! if (getenv("SHELL") != NULL) {
! system(getenv("SHELL"));
! } else {
! system(getenv("COMSPEC") == NULL ? "command.com" :
getenv("COMSPEC"));
! }
! #ifdef __DJGPP__
! __djgpp_set_ctrl_c(1);
! _go32_want_ctrl_break(0);
! #endif /* __DJGPP__ */
#else
#ifdef VMS
system("");
*** lynx2-7-1/lynx_help/lynx_help.html Wed Feb 26 19:30:10 1997
--- lynx2-7-1/lynx_help/lynx_help.html.new Wed Jul 2 22:19:00 1997
***************
*** 25,31 ****
| <a href="http://www.slcc.edu/lynx/faq.html";
>Lynx FAQ</a>
<li><a href="../about_lynx/about_lynx.html">About Lynx</a>
! | <a href="../about_lynx/about_lynx-dev.html">About Lynx-Dev</a>
| <a href="http://www.access.digex.net/~asgilman/lynx/FAQ/";
>Al's Picks (FAQ)</a>
</ul>
--- 25,31 ----
| <a href="http://www.slcc.edu/lynx/faq.html";
>Lynx FAQ</a>
<li><a href="../about_lynx/about_lynx.html">About Lynx</a>
! | <a href="../about_lynx/lynx-dev.html">About Lynx-Dev</a>
| <a href="http://www.access.digex.net/~asgilman/lynx/FAQ/";
>Al's Picks (FAQ)</a>
</ul>
*** lynx2-7-1/src/LYReadCFG.c
--- lynx2-7-1/src/LYReadCFG.c.new
***************
*** 303,309 ****
"gray",
"brightblue",
"brightgreen",
! "lightcyan",
"brightred",
"brightmagenta",
"yellow",
--- 303,309 ----
"gray",
"brightblue",
"brightgreen",
! "brightcyan",
"brightred",
"brightmagenta",
"yellow",
*** lynx2-7-1/src/Makefile.dos Tue May 20 10:15:08 1997
--- lynx2-7-1/src/Makefile.dos.new Wed Jul 2 22:52:02 1997
***************
*** 5,18 ****
LYForms.o LYPrint.o LYrcFile.o LYDownload.o LYNews.o LYKeymap.o \
HTFWriter.o HTInit.o DefaultStyle.o LYLocal.o LYUpload.o \
LYLeaks.o LYexit.o LYJump.o LYList.o LYCgi.o LYTraversal.o \
! LYEditmap.o LYCharSets.o LYCharUtils.o LYMap.o LYCookie.o HTML.o
CFLAGS= $(MCFLAGS) -I.. $(SLANGINC)
CC = gcc
#MCFLAGS = -O -DNCURSES -DFANCY_CURSES -DACCESS_AUTH -DNO_CUSERID -DNOUSERS
-DDOSPATH -DNO_TTYTYPE -DNO_UTMP -I../WWW/library/implementation
-I../djgpp/tcplib/include -I../djgpp/tcplib/include/tcp
-I../djgpp/pdcurses/include
! MCFLAGS = -DNCURSES -DFANCY_CURSES -DACCESS_AUTH -DNO_CUSERID -DNOUSERS
-DDOSPATH -DNO_TTYTYPE -DNO_UTMP -I../WWW/library/implementation
-I../djgpp/tcplib/include -I../djgpp/tcplib/include/tcp
-I../djgpp/pdcurses/include
! WWWLIB = ../WWW/library/djgpp/libwww.a ../djgpp/pdcurses/lib/libcurso.a
../djgpp/tcplib/obj/libtcp.a
all: lynx
--- 5,18 ----
LYForms.o LYPrint.o LYrcFile.o LYDownload.o LYNews.o LYKeymap.o \
HTFWriter.o HTInit.o DefaultStyle.o LYLocal.o LYUpload.o \
LYLeaks.o LYexit.o LYJump.o LYList.o LYCgi.o LYTraversal.o \
! LYEditmap.o LYCharSets.o LYCharUtils.o LYMap.o LYCookie.o LYExtern.o HTML.o
CFLAGS= $(MCFLAGS) -I.. $(SLANGINC)
CC = gcc
#MCFLAGS = -O -DNCURSES -DFANCY_CURSES -DACCESS_AUTH -DNO_CUSERID -DNOUSERS
-DDOSPATH -DNO_TTYTYPE -DNO_UTMP -I../WWW/library/implementation
-I../djgpp/tcplib/include -I../djgpp/tcplib/include/tcp
-I../djgpp/pdcurses/include
! MCFLAGS = -DCOLOR_CURSES -DNCURSES -DFANCY_CURSES -DACCESS_AUTH -DNO_CUSERID
-DNOUSERS -DDOSPATH -DNO_TTYTYPE -DNO_UTMP -DUSE_EXTERNALS
-I../WWW/library/implementation -I../djgpp/tcplib/include
-I../djgpp/tcplib/include/tcp -I../djgpp/pdcurses
! WWWLIB = ../WWW/library/djgpp/libwww.a ../djgpp/pdcurses/lib/pdcurses.a
../djgpp/tcplib/obj/libtcp.a
all: lynx
***************
*** 51,53 ****
--- 51,54 ----
DefaultStyle.o: DefaultStyle.c ../userdefs.h
LYEditmap.o: LYEditmap.c ../userdefs.h
LYCharUtils.o: LYCharUtils.c ../userdefs.h
+ LYExtern.o: LYExtern.c ../userdefs.h
*** lynx2-7-1/WWW/djgpp/Makefile Tue Apr 15 18:40:10 1997
--- lynx2-7-1/WWW/djgpp/Makefile.new Tue Jul 1 00:51:40 1997
***************
*** 5,18 ****
WWW_MACH = djgpp
# The ASIS repository's name for the machine we are on
! ASIS_MACH = hardware/os
! CFLAGS = -O -DEXP_CHARTRANS -DCOLOR_CURSES -DDOSPATH -DNOUSERS -DDEBUG
-I../../../djgpp/tcplib/include -I../../../djgpp/tcplib/include/tcp
LFLAGS =
CC = gcc
# Directory for installed binary:
! BINDIR = /usr/local/bin
# Where is the W3 object library to be installed (not normally done)?
LIBDIR = $(WWW)/Library/Implementation/$(WWW_MACH)
--- 5,18 ----
WWW_MACH = djgpp
# The ASIS repository's name for the machine we are on
! #ASIS_MACH = hardware/os
! CFLAGS = -O -DCOLOR_CURSES -DDOSPATH -DNOUSERS -DDEBUG
-I../../../djgpp/tcplib/include -I../../../djgpp/tcplib/include/tcp
LFLAGS =
CC = gcc
# Directory for installed binary:
! #BINDIR = /usr/local/bin
# Where is the W3 object library to be installed (not normally done)?
LIBDIR = $(WWW)/Library/Implementation/$(WWW_MACH)
Sorry for the length. I don't have a server available now on which to
make them available.
Doug
__
Doug Kaufman
Internet: address@hidden (preferred)
address@hidden
;
; To UNSUBSCRIBE: Send a mail message to address@hidden
; with "unsubscribe lynx-dev" (without the
; quotation marks) on a line by itself.
;
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- LYNX-DEV LYNX_386 - Bug fixes for lynx.2.7.1ac-0.30,
Doug Kaufman <=