diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/GridText.c | 2 | ||||
| -rw-r--r-- | src/LYCurses.c | 2 | ||||
| -rw-r--r-- | src/LYDownload.c | 2 | ||||
| -rw-r--r-- | src/LYExtern.c | 9 | ||||
| -rw-r--r-- | src/LYMain.c | 1 | ||||
| -rw-r--r-- | src/LYMainLoop.c | 14 | ||||
| -rw-r--r-- | src/LYReadCFG.c | 2 | ||||
| -rw-r--r-- | src/makefile.dos | 6 |
8 files changed, 33 insertions, 5 deletions
diff --git a/src/GridText.c b/src/GridText.c index e057c95f..0f764f49 100644 --- a/src/GridText.c +++ b/src/GridText.c @@ -199,8 +199,8 @@ struct _HText { char kanji_buf; /* Lead multibyte */ int in_sjis; /* SJIS flag */ -#ifdef EXP_CHARTRANS BOOL have_8bit_chars; /* Any non-ASCII chars? */ +#ifdef EXP_CHARTRANS LYUCcharset * UCI; /* node_anchor UCInfo */ int UCLYhndl; /* charset we are fed */ UCTransParams T; diff --git a/src/LYCurses.c b/src/LYCurses.c index bad0ceb6..805127cc 100644 --- a/src/LYCurses.c +++ b/src/LYCurses.c @@ -407,9 +407,11 @@ PRIVATE void LYsetWAttr ARGS1(WINDOW *, win) #endif /* DOSPATH */ } +#ifndef __DJGPP__ if (no_color_video < 0) { no_color_video = tigetnum("ncv"); } +#endif /* __DJGPP__ */ if (Current_Attr & A_BOLD) code |= 1; diff --git a/src/LYDownload.c b/src/LYDownload.c index 53758e9a..82002a9a 100644 --- a/src/LYDownload.c +++ b/src/LYDownload.c @@ -633,7 +633,9 @@ PUBLIC int LYdownload_options ARGS2( HTAlert(CANNOT_OPEN_TEMP); return(-1); } +#ifndef DOSPATH chmod(tempfile, 0600); +#endif /* DOSPATH */ LYstrncpy(LYValidDownloadFile, data_file, diff --git a/src/LYExtern.c b/src/LYExtern.c index cbe7ac3d..69607d02 100644 --- a/src/LYExtern.c +++ b/src/LYExtern.c @@ -73,7 +73,16 @@ void run_external(char * c) 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(); } diff --git a/src/LYMain.c b/src/LYMain.c index ff473d5d..89db134d 100644 --- a/src/LYMain.c +++ b/src/LYMain.c @@ -532,6 +532,7 @@ PUBLIC int main ARGS2( #ifdef DJGPP sock_init(); + _fmode = O_BINARY; #endif #ifdef DOSPATH diff --git a/src/LYMainLoop.c b/src/LYMainLoop.c index cdaedb29..154930e6 100644 --- a/src/LYMainLoop.c +++ b/src/LYMainLoop.c @@ -4233,7 +4233,19 @@ check_add_bookmark_to_self: #ifdef DOSPATH system("cls"); system("echo Type EXIT to return to Lynx."); - system(getenv("COMSPEC") == NULL ? "command.com" : getenv("COMSPEC")); +#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(""); diff --git a/src/LYReadCFG.c b/src/LYReadCFG.c index 60f80410..25f4301e 100644 --- a/src/LYReadCFG.c +++ b/src/LYReadCFG.c @@ -303,7 +303,7 @@ static char *Color_Strings[16] = "gray", "brightblue", "brightgreen", - "lightcyan", + "brightcyan", "brightred", "brightmagenta", "yellow", diff --git a/src/makefile.dos b/src/makefile.dos index 367d2e62..bb9c7f09 100644 --- a/src/makefile.dos +++ b/src/makefile.dos @@ -5,13 +5,13 @@ LYOptions.o LYReadCFG.o LYSearch.o LYHistory.o \ 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 +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 = -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 -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 @@ -51,3 +51,5 @@ LYDownload.o: LYDownload.c ../userdefs.h DefaultStyle.o: DefaultStyle.c ../userdefs.h LYEditmap.o: LYEditmap.c ../userdefs.h LYCharUtils.o: LYCharUtils.c ../userdefs.h +LYExtern.o: LYExtern.c ../userdefs.h + |