Attachment #27692 for bug #46878

View | Details | Raw Unified | Return to bug 46878
Collapse All | Expand All




EXTRA_PATCHES=	${.CURDIR}/files/patch-charset.c \
		${.CURDIR}/files/patch-cook.c \
		${.CURDIR}/files/patch-init.c \
		${.CURDIR}/files/patch-lang.c \
		${.CURDIR}/files/patch-misc.c \
		${.CURDIR}/files/patch-page.c

.include "${MASTERDIR}/Makefile"

CONFIGURE_ARGS+=	--disable-locale --with-screen=termcap
			--without-ncurses \
			--with-mime-default-charset=big5

Lines 1-20 Link Here

(-)files/patch-charset.c (-17 / +8 lines)
1	--- src/charset.c.orig Wed Apr 24 18:41:18 2002	1	--- src/charset.c.orig Wed Jan 8 23:12:11 2003
2	+++ src/charset.c Sun May 26 13:33:00 2002	2	+++ src/charset.c Wed Jan 8 23:12:28 2003
3	@@ -333,7 +333,7 @@	3	@@ -443,7 +443,7 @@
		4	unsigned char *c;
4		5
5	for (c = (unsigned char ) buf; c; c++) {	6	for (c = (unsigned char ) buf; c; c++) {
6	#ifdef ENABLE_MBLEN	7	- if (!(my_isprint(c) \|\| c == 8 \|\| c == 9 \|\| c == 10 \|\| c == 12 \|\| c == 13))
7	- if (!my_isprint(c) && (t_len = mblen((const char ) c, MAX(2,MB_CUR_MAX))) <= 1)	8	+ if (!(my_isprint(c) \|\| c == 8 \|\| c == 9 \|\| c == 10 \|\| c == 12 \|\| c == 13 \|\| *c == 27))
8	+ if (!my_isprint(c) && (t_len = mblen((const char ) c, MAX(2,MB_CUR_MAX))) <= 1 && *c != 27)
9	*c = '?';	9	*c = '?';
10	while (--t_len > 0)	10	}
11	c++;	11	#endif /* MULTIBYTE_ABLE && !NO_LOCALE */
12	@@ -361,7 +361,7 @@
13
14	for (c = (unsigned char )buf; c; c++) {
15	#ifdef ENABLE_MBLEN
16	- if (!(my_isprint(c) \|\| c == 8 \|\| c == 9 \|\| c == 10 \|\| c == 12 \|\| c == 13) && (t_len = mblen((const char *) c, MAX(2,MB_CUR_MAX))) <= 1)
17	+ if (!(my_isprint(c) \|\| c == 8 \|\| c == 9 \|\| c == 10 \|\| c == 12 \|\| c == 13 \|\| c == 27 ) && (t_len = mblen((const char ) c, MAX(2,MB_CUR_MAX))) <= 1)
18	*c = '?';
19	while (--t_len > 0)
20	c++;




--- src/cook.c.orig	Sat Dec 14 22:31:23 2002
+++ src/cook.c	Tue Jan  7 23:53:11 2003
@@ -106,7 +106,7 @@
 				space--;
 			}
 
-		} else if (((*p) & 0xFF) < ' ' && *p != '\n') {	/* Literal ctrl chars */
+		} else if (((*p) & 0xFF) < ' ' && *p != '\n' && *p != 27) {	/* Literal ctrl chars */
 			*q++ = '^';
 			if (--space) {
 				*q++ = ((*p) & 0xFF) + '@';
@@ -793,7 +793,7 @@
 		if (expand_ctrl_chars(to, line, sizeof(to) - 1, cook_width))
 			flags |= C_CTRLL;				/* Line contains form-feed */
 
-		put_cooked(wrap_lines, flags, "%s", to);
+		put_cooked(wrap_lines && strncasecmp(tinrc.mm_local_charset, "Big5", 4), flags, "%s", to);
 	} /* while */
 
 	/*
 		if (*p == '\n' || ((overflow + p - bufp >= cCOLS) && wrap_lines)) {




--- src/init.c.orig	Wed Jan  8 23:43:57 2003
+++ src/init.c	Wed Jan  8 23:45:36 2003
@@ -289,8 +289,8 @@
 	2,		/* recent_time */
 	32,		/* groupname_max_length */
 	KILL_READ,		/* kill_level */

+	MIME_ENCODING_8BIT,		/* post_mime_encoding */
 	POST_PROC_NONE,			/* post_process */
 	REREAD_ACTIVE_FILE_SECS,	/* reread_active_file_secs */
 	1,		/* scroll_lines */
@@ -333,7 +333,7 @@
 	0,		/* col_title (initialised later) */
 	2,		/* word_h_display_marks */
 	TRUE,		/* word_highlight */
 	0,		/* wrap_column */
 #ifdef HAVE_COLOR
-	FALSE,		/* use_color */
+	TRUE,		/* use_color */
 #endif /* HAVE_COLOR */
 	TRUE,		/* add_posted_to_filter */
 	TRUE,		/* advertising */
@@ -364,11 +364,11 @@
 	TRUE,		/* keep_dead_articles */
 	TRUE,		/* keep_posted_articles */
 	POSTED_FILE,	/* keep_posted_articles_file */




--- src/misc.c.orig	Wed Jan  8 22:09:21 2003
+++ src/misc.c	Wed Jan  8 22:13:29 2003
@@ -1064,7 +1064,9 @@
 		return (isprint(c) || (c >= 0xa0 && c <= 0xff));
 	else if (!strncasecmp(txt_mime_charsets[tinrc.mm_network_charset], "ISO-2022", 8))
 		return (isprint(c) || (c == 0x1b));
-	else if (!strncasecmp(txt_mime_charsets[tinrc.mm_network_charset], "EUC-", 4) || !strncasecmp(txt_mime_charsets[tinrc.mm_network_charset], "Big5", 4))
+	else if (!strncasecmp(txt_mime_charsets[tinrc.mm_network_charset], "Big5", 4))
+		return (isprint(c) || (c >= 0x40 && c <= 0xfe));
+	else if (!strncasecmp(txt_mime_charsets[tinrc.mm_network_charset], "EUC-", 4))
 		return 1;
 	else /* KOI8-* and UTF-8 */
 		return (isprint(c) || (c >= 0x80 && c <= 0xff));




--- src/page.c.orig	Wed Jan  8 00:19:22 2003
+++ src/page.c	Wed Jan  8 00:19:47 2003
@@ -980,7 +980,7 @@
 			}
 		} else
 #	endif /* MULTIBYTE_ABLE && !NO_LOCALE */
-			if ((int) strlen(line) >= cCOLS)
+			if ((int) strlen(line) >= cCOLS && strncasecmp(tinrc.mm_local_charset, "Big5", 4))
 				bytes = cCOLS;
 		line[bytes] = '\0';
 
-		if ((int) strlen(line) >= cCOLS)
-			line[cCOLS] = '\0';
+		if ((int) strlen(line) >= LEN)
+			line[LEN] = '\0';
 
 		/*
 		 * rotN encoding on body and sig data only
@@ -971,7 +971,7 @@
 		strip_line(line);
 
 #ifndef USE_CURSES
-		snprintf (screen[i + scroll_region_top].col, cCOLS, "%s" cCRLF, line);
+		snprintf (screen[i + scroll_region_top].col, LEN, "%s" cCRLF, line);
 #endif /* !USE_CURSES */
 
 		MoveCursor (i + scroll_region_top, 0);
@@ -1492,7 +1492,7 @@
 					chunk += 50;
 					pgart.rawl = my_realloc((char *) pgart.rawl, sizeof(t_lineinfo) * chunk);
 				}
-			} while ((fgets(buff, cCOLS + 1, pgart.raw)) != NULL);
+			} while ((fgets(buff, LEN + 1, pgart.raw)) != NULL);
 
 			j--;
 			pgart.rawl = my_realloc((char *) pgart.rawl, sizeof(t_lineinfo) * j);

Return to bug 46878

Lines 15-26 Link Here

(-)Makefile (-4 / +1 lines)
15	EXTRA_PATCHES= ${.CURDIR}/files/patch-charset.c \	15	EXTRA_PATCHES= ${.CURDIR}/files/patch-charset.c \
16	${.CURDIR}/files/patch-cook.c \	16	${.CURDIR}/files/patch-cook.c \
17	${.CURDIR}/files/patch-init.c \	17	${.CURDIR}/files/patch-init.c \
18	${.CURDIR}/files/patch-lang.c \
19	${.CURDIR}/files/patch-misc.c \	18	${.CURDIR}/files/patch-misc.c \
20	${.CURDIR}/files/patch-page.c	19	${.CURDIR}/files/patch-page.c
21		20
22	.include "${MASTERDIR}/Makefile"	21	.include "${MASTERDIR}/Makefile"
23		22
24	CONFIGURE_ARGS+= --disable-curses \	23	CONFIGURE_ARGS+= --disable-locale --with-screen=termcap
25	--without-ncurses \
26	--with-mime-default-charset=big5

Lines 1-19 Link Here

(-)files/patch-cook.c (-13 / +14 lines)
1	--- src/cook.c.orig Mon Feb 19 22:59:13 2001	1	--- src/cook.c.orig Sat Dec 14 22:31:23 2002
2	+++ src/cook.c Mon Apr 30 02:57:21 2001	2	+++ src/cook.c Tue Jan 7 23:53:11 2003
3	@@ -109,7 +109,7 @@	3	@@ -106,7 +106,7 @@
4	while (i++ < j)	4	space--;
5	*q++ = ' ';	5	}
6		6
7	- } else if (((p) & 0xFF) < ' ' && p != '\n') { /* Literal ctrl chars */	7	- } else if (((p) & 0xFF) < ' ' && p != '\n') { /* Literal ctrl chars */
8	+ } else if (((p) & 0xFF) < ' ' && p != '\n' && p != 27) { / Literal ctrl chars */	8	+ } else if (((p) & 0xFF) < ' ' && p != '\n' && p != 27) { / Literal ctrl chars */
9	*q++ = '^';	9	*q++ = '^';
10	q++ = ((p) & 0xFF) + '@';	10	if (--space) {
11	if (p == '\f') / ^L detected */	11	q++ = ((p) & 0xFF) + '@';
12	@@ -147,6 +147,7 @@	12	@@ -793,7 +793,7 @@
13	vsnprintf (buf, sizeof(buf) - 1, fmt, ap);	13	if (expand_ctrl_chars(to, line, sizeof(to) - 1, cook_width))
		14	flags \|= C_CTRLL; /* Line contains form-feed */
14		15
15	bufp = buf;	16	- put_cooked(wrap_lines, flags, "%s", to);
16	+ wrap_lines = FALSE;	17	+ put_cooked(wrap_lines && strncasecmp(tinrc.mm_local_charset, "Big5", 4), flags, "%s", to);
		18	} /* while */
17		19
18	for (p = bufp; *p; p++) {	20	/*
19	if (*p == '\n' \|\| ((overflow + p - bufp >= cCOLS) && wrap_lines)) {

Lines 1-6 Link Here

(-)files/patch-init.c (-8 / +8 lines)
1	--- src/init.c.orig Sat Sep 23 15:52:42 2000	1	--- src/init.c.orig Wed Jan 8 23:43:57 2003
2	+++ src/init.c Sat Sep 23 15:55:26 2000	2	+++ src/init.c Wed Jan 8 23:45:36 2003
3	@@ -270,8 +270,8 @@	3	@@ -289,8 +289,8 @@
4	2, /* recent_time */	4	2, /* recent_time */
5	32, /* groupname_max_length */	5	32, /* groupname_max_length */
6	KILL_READ, /* kill_level */	6	KILL_READ, /* kill_level */
Lines 10-26 Link Here
10	+ MIME_ENCODING_8BIT, /* post_mime_encoding */	10	+ MIME_ENCODING_8BIT, /* post_mime_encoding */
11	POST_PROC_NONE, /* post_process */	11	POST_PROC_NONE, /* post_process */
12	REREAD_ACTIVE_FILE_SECS, /* reread_active_file_secs */	12	REREAD_ACTIVE_FILE_SECS, /* reread_active_file_secs */
13	SHOW_FROM_NAME, /* show_author */	13	1, /* scroll_lines */
14	@@ -302,7 +302,7 @@	14	@@ -333,7 +333,7 @@
15	0, /* col_title (initialised later) */
16	2, /* word_h_display_marks */
17	TRUE, /* word_highlight */	15	TRUE, /* word_highlight */
		16	0, /* wrap_column */
		17	#ifdef HAVE_COLOR
18	- FALSE, /* use_color */	18	- FALSE, /* use_color */
19	+ TRUE, /* use_color */	19	+ TRUE, /* use_color */
20	#endif /* HAVE_COLOR */	20	#endif /* HAVE_COLOR */
21	TRUE, /* add_posted_to_filter */	21	TRUE, /* add_posted_to_filter */
22	TRUE, /* advertising */	22	TRUE, /* advertising */
23	@@ -335,11 +335,11 @@	23	@@ -364,11 +364,11 @@
24	TRUE, /* keep_dead_articles */	24	TRUE, /* keep_dead_articles */
25	TRUE, /* keep_posted_articles */	25	TRUE, /* keep_posted_articles */
26	POSTED_FILE, /* keep_posted_articles_file */	26	POSTED_FILE, /* keep_posted_articles_file */

Lines 1-10 Link Here

(-)files/patch-misc.c (-10 / +13 lines)
1	--- src/misc.c.orig Thu Aug 3 21:49:22 2000	1	--- src/misc.c.orig Wed Jan 8 22:09:21 2003
2	+++ src/misc.c Mon Apr 9 00:47:20 2001	2	+++ src/misc.c Wed Jan 8 22:13:29 2003
3	@@ -1169,6 +1169,7 @@	3	@@ -1064,7 +1064,9 @@
4	my_isprint (	4	return (isprint(c) \|\| (c >= 0xa0 && c <= 0xff));
5	int c)	5	else if (!strncasecmp(txt_mime_charsets[tinrc.mm_network_charset], "ISO-2022", 8))
6	{	6	return (isprint(c) \|\| (c == 0x1b));
7	+ return (isprint(c) \|\| (c>=0x40 && c<=0xfe));	7	- else if (!strncasecmp(txt_mime_charsets[tinrc.mm_network_charset], "EUC-", 4) \|\| !strncasecmp(txt_mime_charsets[tinrc.mm_network_charset], "Big5", 4))
8	#ifndef NO_LOCALE	8	+ else if (!strncasecmp(txt_mime_charsets[tinrc.mm_network_charset], "Big5", 4))
9	/* use locale */	9	+ return (isprint(c) \|\| (c >= 0x40 && c <= 0xfe));
10	return isprint(c);	10	+ else if (!strncasecmp(txt_mime_charsets[tinrc.mm_network_charset], "EUC-", 4))
		11	return 1;
		12	else /* KOI8-* and UTF-8 */
		13	return (isprint(c) \|\| (c >= 0x80 && c <= 0xff));

Lines 1-31 Link Here

(-)files/patch-page.c (-30 / +10 lines)
1	--- src/page.c.orig Sat Apr 27 23:04:47 2002	1	--- src/page.c.orig Wed Jan 8 00:19:22 2003
2	+++ src/page.c Sun May 26 13:35:27 2002	2	+++ src/page.c Wed Jan 8 00:19:47 2003
3	@@ -952,8 +952,8 @@	3	@@ -980,7 +980,7 @@
4	if ((line = tin_fgets (file, FALSE)) == NULL)	4	}
5	break; /* ran out of message */	5	} else
		6	# endif /* MULTIBYTE_ABLE && !NO_LOCALE */
		7	- if ((int) strlen(line) >= cCOLS)
		8	+ if ((int) strlen(line) >= cCOLS && strncasecmp(tinrc.mm_local_charset, "Big5", 4))
		9	bytes = cCOLS;
		10	line[bytes] = '\0';
6		11
7	- if ((int) strlen(line) >= cCOLS)
8	- line[cCOLS] = '\0';
9	+ if ((int) strlen(line) >= LEN)
10	+ line[LEN] = '\0';
11
12	/*
13	* rotN encoding on body and sig data only
14	@@ -971,7 +971,7 @@
15	strip_line(line);
16
17	#ifndef USE_CURSES
18	- snprintf (screen[i + scroll_region_top].col, cCOLS, "%s" cCRLF, line);
19	+ snprintf (screen[i + scroll_region_top].col, LEN, "%s" cCRLF, line);
20	#endif /* !USE_CURSES */
21
22	MoveCursor (i + scroll_region_top, 0);
23	@@ -1492,7 +1492,7 @@
24	chunk += 50;
25	pgart.rawl = my_realloc((char ) pgart.rawl, sizeof(t_lineinfo) chunk);
26	}
27	- } while ((fgets(buff, cCOLS + 1, pgart.raw)) != NULL);
28	+ } while ((fgets(buff, LEN + 1, pgart.raw)) != NULL);
29
30	j--;
31	pgart.rawl = my_realloc((char ) pgart.rawl, sizeof(t_lineinfo) j);