Well, I "read" through the dev22->dev23 patch,
it looks impressive
(thanks, Tom, lots of strcpy etc. moved onto the safe way).
Few inconsistencies were found:
1) windows makefile have EXP_CHARTRANS symbol,
which is unused since ~1997,
instead, it would be nice to add SOURCE_CACHE and USE_PRETTYSRC
(both are disabled by default in lynx.cfg, so it would be safe
to compile these features into the binary anyway).
--- 2.8.3dev.22/makefile.msc Mon Feb 14 20:07:39 2000
+++ 2.8.3dev.23/makefile.msc Sun Mar 26 19:14:00 2000
@@ -11,20 +11,58 @@
# pdcurses.lib panel.lib dirent.obj curses.h panel.h dirent.h
ETC_LIB = lib
-INCLUDES = /I "." /I "$(SRC_DIR)" /I "$(SRC_DIR)\chrtrans" /I "$(WWW_DIR)" /I
"$(ETC_LIB)"
-DEFS = /D "NDEBUG" /D\
- "__WIN32__" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "NO_UNISTD_H" /D VC="2.14FM" /D\
- "_WINDOWS" /D "XMOSAIC_HACK" /D "ACCESS_AUTH" /D "NO_FILIO_H" /D "NO_UTMP" /D\
- "NO_CUSERID" /D "NO_TTYTYPE" /D "NOSIGHUP" /D "DOSPATH" /D "NOUSERS" /D\
- "EXP_CHARTRANS" /D "NCURSES" /D "FANCY_CURSES" /D "COLOR_CURSES" /D\
- "USE_COLOR_TABLE" /D "HAVE_KEYPAD" /D "NCURSES_VERSION" /D "USE_EXTERNALS" /D\
- "PDCURSES" /D "SUPPORT_MULTIBYTE_EDIT" /D "USE_MULTIBYTE_CURSES" \
- /D "LONG_LIST" /D "DISP_PARTIAL" /D\
- "EXP_PERSISTENT_COOKIES" /D "NO_CONFIG_INFO" /D\
- "EXP_ALT_BINDINGS" /D LY_MAXPATH="1024" /D _WIN_CC="1" /D "CJK_EX" /D "SH_EX" /D
"WIN_EX" /D "USE_ZLIB"
+INCLUDES = \
+ /I "." \
+ /I "$(SRC_DIR)" \
+ /I "$(SRC_DIR)\chrtrans" \
+ /I "$(WWW_DIR)" \
+ /I "$(ETC_LIB)"
+DEFS = \
+ /D "__WIN32__" \
+ /D "_CONSOLE" \
+ /D "_MBCS" \
+ /D "_WINDOWS" \
+ /D "ACCESS_AUTH" \
+ /D "CJK_EX" \
+ /D "COLOR_CURSES" \
+ /D "DIRED_SUPPORT" \
+ /D "DISP_PARTIAL" \
+ /D "DOSPATH" \
+ /D "EXP_ALT_BINDINGS" \
+ /D "EXP_CHARTRANS" \
^^^^^^^^^^^^^^
+ /D "EXP_PERSISTENT_COOKIES" \
+ /D "FANCY_CURSES" \
+ /D "HAVE_KEYPAD" \
+ /D "LONG_LIST" \
+ /D "NCURSES" \
+ /D "NCURSES_VERSION" \
+ /D "NDEBUG" \
+ /D "NO_CONFIG_INFO" \
+ /D "NO_CUSERID" \
+ /D "NO_FILIO_H" \
+ /D "NO_TTYTYPE" \
+ /D "NO_UNISTD_H" \
+ /D "NO_UTMP" \
+ /D "NOSIGHUP" \
+ /D "NOUSERS" \
+ /D "PDCURSES" \
+ /D "SH_EX" \
+ /D "SUPPORT_MULTIBYTE_EDIT" \
+ /D "USE_COLOR_TABLE" \
+ /D "USE_EXTERNALS" \
+ /D "USE_MULTIBYTE_CURSES" \
+ /D "USE_ZLIB" \
+ /D "WIN_EX" \
+ /D "WIN32" \
+ /D "XMOSAIC_HACK" \
+ /D _WIN_CC="1" \
+ /D LY_MAXPATH="1024" \
+ /D VC="2.14FM"
CFLAGS = /nologo /MT /W3 /GX /O2 /c
+#CFLAGS = /nologo /MT /W3 /GX /Zi /c
LDFLAGS = /nologo /subsystem:console /incremental:no /machine:I386
+#LDFLAGS = /debug /nologo /subsystem:console /incremental:no /machine:I386
LIBS = kernel32.lib user32.lib wsock32.lib /NODEFAULTLIB:libc\
$(ETC_LIB)\pdcurses.lib $(ETC_LIB)\zlib.lib dirent.obj
2) There is no my code in new function LYformTitle(),
my code left in LYBookmarks.c but the comment was ocassionally copied
by mistake. The same with FM comment.
The function should probably be renamed to something more obvious
with Japanese in mind.
--- 2.8.3dev.22/src/LYCharUtils.c Fri Feb 25 04:38:35 2000
+++ 2.8.3dev.23/src/LYCharUtils.c Sun Mar 26 19:14:00 2000
@@ -4024,4 +4025,40 @@
}
return FALSE;
+}
+
+ /*
+ * Create the Title with any left-angle-brackets
+ * converted to < entities and any ampersands
+ * converted to & entities. - FM
+ *
+ * Convert 8-bit letters to &#xUUUU to avoid dependencies
+ * from display character set which may need changing.
+ * Do NOT convert any 8-bit chars if we have CJK display. - LP
+ */
+void LYformTitle ARGS2(
+ char **, dst,
+ CONST char *, src)
+{
+ if (HTCJK == JAPANESE) {
+ char *tmp_buffer = NULL;
+ if ((tmp_buffer = (char *) malloc (strlen(src)+1)) == 0)
+ outofmem(__FILE__, "LYformTitle");
+ switch(kanji_code) { /* 1997/11/22 (Sat) 09:28:00 */
+ case EUC:
+ TO_EUC((CONST unsigned char *) src, (unsigned char *) tmp_buffer);
+ break;
+ case SJIS:
+ TO_SJIS((CONST unsigned char *) src, (unsigned char *) tmp_buffer);
+ break;
+ default:
+ CTRACE((tfp, "\nLYformTitle: kanji_code is an unexpected value."));
+ strcpy(tmp_buffer, src);
+ break;
+ }
+ StrAllocCopy(*dst, tmp_buffer);
+ FREE(tmp_buffer);
+ } else {
+ StrAllocCopy(*dst, src);
+ }
}
3)
+* disentangle some of the PDCurses ifdef's from ncurses, including the mouse
+ handling. The symbol PDCURSES should be used for PDCurses, not NCURSES*
+ or DOSPATH -TD
2000-03-12 (2.8.3dev.22)
Should PDCURSES symbol be added to makefile.dos or probably HTUtils.h ?
makefile.dos now have:
-DCOLOR_CURSES \
-DFANCY_CURSES \
-DHAVE_GETBKGD \
-DNCURSES \
4) also, reading the discussion on english grammar (URLs vs URL's)
I have remembered another thing on statusline:
I see several popular statusline messages ended with "." period,
but should obviously be without. The most annoying are:
"looking for lynx.browser.org."
"Making HTTP connection to some.host.com:81."
(please remove the trailing period above)
It could be probably "..." but this will looks
rather confusing after the host name or like.
Could this be done in a reasonable manner?
Leonid.
