diff options
| -rw-r--r-- | CHANGES | 9 | ||||
| -rw-r--r-- | WWW/Library/Implementation/SGML.c | 14 | ||||
| -rw-r--r-- | src/GridText.c | 16 | ||||
| -rw-r--r-- | src/LYOptions.c | 4 | ||||
| -rw-r--r-- | src/LYOptions.h | 6 |
5 files changed, 28 insertions, 21 deletions
diff --git a/CHANGES b/CHANGES index 5b06f061..eace0fd4 100644 --- a/CHANGES +++ b/CHANGES @@ -1,11 +1,16 @@ --- $LynxId: CHANGES,v 1.872 2016/12/23 07:47:02 tom Exp $ +-- $LynxId: CHANGES,v 1.874 2017/01/01 02:03:07 tom Exp $ =============================================================================== Changes since Lynx 2.8 release =============================================================================== -2016-12-23 (2.8.9dev.12) +2016-12-31 (2.8.9dev.12) +* build-fix for color-style with leak-checking -TD +* amend merge/fixes from + http://en.sourceforge.jp/project/lynx-win32-pata + as well as problem introduced by 2.8.8dev.6 cleanup -TH * update ca.po, from http://translationproject.org/latest/lynx +* tidy whitespace in lynx.cfg (report by David Niklas) * fix two more typos in the list of ENABLE_LYNXRC in lynx.cfg -TD * remove a repeated item for SEND_USERAGENT from lynx.cfg (Larry Hynes) * accept userinfo in a URL, subject to override by -auth option or -pauth diff --git a/WWW/Library/Implementation/SGML.c b/WWW/Library/Implementation/SGML.c index 47dbc306..138ce334 100644 --- a/WWW/Library/Implementation/SGML.c +++ b/WWW/Library/Implementation/SGML.c @@ -1,5 +1,5 @@ /* - * $LynxId: SGML.c,v 1.159 2016/11/24 20:08:10 tom Exp $ + * $LynxId: SGML.c,v 1.160 2017/01/01 00:56:18 Takeshi.Hataguchi Exp $ * * General SGML Parser code SGML.c * ======================== @@ -4565,15 +4565,15 @@ unsigned char *EUC_TO_SJIS1(unsigned HI, unsigned LO, unsigned char *SJCODE) { - if (HI == 0x8E) { - unsigned char HI_data[2]; - unsigned char LO_data[2]; + unsigned char HI_data[2]; + unsigned char LO_data[2]; - HI_data[0] = UCH(HI); - LO_data[0] = UCH(LO); + HI_data[0] = UCH(HI); + LO_data[0] = UCH(LO); + if (HI == 0x8E) { JISx0201TO0208_EUC(HI, LO, HI_data, LO_data); } - JIS_TO_SJIS1(UCH(HI & 0x7F), UCH(LO & 0x7F), SJCODE); + JIS_TO_SJIS1(UCH(HI_data[0] & 0x7F), UCH(LO_data[0] & 0x7F), SJCODE); return SJCODE; } diff --git a/src/GridText.c b/src/GridText.c index a2f5479a..35bd80e7 100644 --- a/src/GridText.c +++ b/src/GridText.c @@ -1,5 +1,5 @@ /* - * $LynxId: GridText.c,v 1.290 2016/11/24 18:10:02 tom Exp $ + * $LynxId: GridText.c,v 1.291 2017/01/01 00:56:20 Takeshi.Hataguchi Exp $ * * Character grid hypertext object * =============================== @@ -4444,14 +4444,12 @@ void HText_appendCharacter(HText *text, int ch) case SJIS: if ((text->kcode == EUC) || (text->kcode == JIS)) { - if (!conv_jisx0201kana && IS_EUC_X0201KANA(hi, lo)) { - if (IS_EUC_X0201KANA(hi, lo)) { - line->data[line->size++] = (char) lo; - } else { - EUC_TO_SJIS1(hi, lo, tmp); - line->data[line->size++] = (char) tmp[0]; - line->data[line->size++] = (char) tmp[1]; - } + if (!conv_jisx0201kana && IS_EUC_X0201KANA(hi, lo)) + line->data[line->size++] = lo; + else { + EUC_TO_SJIS1(hi, lo, tmp); + line->data[line->size++] = (char) tmp[0]; + line->data[line->size++] = (char) tmp[1]; } } else if (IS_SJIS_2BYTE(hi, lo)) { line->data[line->size++] = (char) hi; diff --git a/src/LYOptions.c b/src/LYOptions.c index 4c6b98dd..8e795c51 100644 --- a/src/LYOptions.c +++ b/src/LYOptions.c @@ -1,4 +1,4 @@ -/* $LynxId: LYOptions.c,v 1.170 2016/11/24 18:30:48 tom Exp $ */ +/* $LynxId: LYOptions.c,v 1.171 2017/01/01 01:49:49 tom Exp $ */ #include <HTUtils.h> #include <HTFTP.h> #include <HTTP.h> /* 'reloading' flag */ @@ -2513,7 +2513,7 @@ static BOOLEAN GetOptValues(OptValues * table, char *value, #ifdef USE_COLOR_STYLE #ifdef LY_FIND_LEAKS -static void free_colorstyle_leaks(void) +void free_colorstyle_leaks(void) { FREE(color_style_values); } diff --git a/src/LYOptions.h b/src/LYOptions.h index 0c5f5f2a..2811f2ad 100644 --- a/src/LYOptions.h +++ b/src/LYOptions.h @@ -1,4 +1,4 @@ -/* $LynxId: LYOptions.h,v 1.31 2013/10/22 00:37:32 tom Exp $ */ +/* $LynxId: LYOptions.h,v 1.32 2017/01/01 01:51:23 tom Exp $ */ #ifndef LYOPTIONS_H #define LYOPTIONS_H @@ -36,6 +36,10 @@ extern "C" { extern void build_lss_enum(HTList *); #endif +#if defined(USE_COLOR_STYLE) && defined(LY_FIND_LEAKS) + extern void free_colorstyle_leaks(void); +#endif + #ifdef __cplusplus } #endif |