From d75a0431ba12de1764c50d6fbfb48e0e90f75179 Mon Sep 17 00:00:00 2001 From: Yen-Ming Lee Date: Thu, 23 Jan 2003 13:34:37 +0000 Subject: These patches were merged into main stream source tree, so remove these patches and unbreak zh-tin Approved by: MAINTAINER --- chinese/tin/Makefile | 6 +----- chinese/tin/files/patch-attrib.c | 2 +- chinese/tin/files/patch-charset.c | 11 ----------- chinese/tin/files/patch-cook.c | 20 -------------------- chinese/tin/files/patch-misc.c | 22 ---------------------- chinese/tin/files/patch-page.c | 11 ----------- 6 files changed, 2 insertions(+), 70 deletions(-) delete mode 100644 chinese/tin/files/patch-charset.c delete mode 100644 chinese/tin/files/patch-cook.c delete mode 100644 chinese/tin/files/patch-misc.c delete mode 100644 chinese/tin/files/patch-page.c diff --git a/chinese/tin/Makefile b/chinese/tin/Makefile index b8e03d577ef5..efd122bdb9dd 100644 --- a/chinese/tin/Makefile +++ b/chinese/tin/Makefile @@ -13,11 +13,7 @@ MASTERDIR= ${.CURDIR}/../../news/tin MAINTAINER= yssu@CCCA.NCTU.edu.tw EXTRA_PATCHES= ${.CURDIR}/files/patch-attrib.c \ - ${.CURDIR}/files/patch-charset.c \ - ${.CURDIR}/files/patch-cook.c \ - ${.CURDIR}/files/patch-init.c \ - ${.CURDIR}/files/patch-misc.c \ - ${.CURDIR}/files/patch-page.c + ${.CURDIR}/files/patch-init.c .include "${MASTERDIR}/Makefile" diff --git a/chinese/tin/files/patch-attrib.c b/chinese/tin/files/patch-attrib.c index c533ac661a4a..12d928e92494 100644 --- a/chinese/tin/files/patch-attrib.c +++ b/chinese/tin/files/patch-attrib.c @@ -4,7 +4,7 @@ fprintf(fp, "delete_tmp_files=ON\n"); fprintf(fp, "followup_to=poster\n\n"); -+ fprintf(fp, _("# in *sources* set post process type to shar\n")); ++ fprintf(fp, _("# in tw* set charset to Big5\n")); + fprintf(fp, "scope=tw*\n"); + fprintf(fp, "mm_network_charset=Big5\n"); + fprintf(fp, "undeclared_charset=Big5\n"); diff --git a/chinese/tin/files/patch-charset.c b/chinese/tin/files/patch-charset.c deleted file mode 100644 index eb7350b47aac..000000000000 --- a/chinese/tin/files/patch-charset.c +++ /dev/null @@ -1,11 +0,0 @@ ---- src/charset.c.orig Wed Jan 8 23:12:11 2003 -+++ src/charset.c Wed Jan 8 23:12:28 2003 -@@ -443,7 +443,7 @@ - unsigned char *c; - - for (c = (unsigned char *) buf; *c; c++) { -- if (!(my_isprint(*c) || *c == 8 || *c == 9 || *c == 10 || *c == 12 || *c == 13)) -+ if (!(my_isprint(*c) || *c == 8 || *c == 9 || *c == 10 || *c == 12 || *c == 13 || *c == 27)) - *c = '?'; - } - #endif /* MULTIBYTE_ABLE && !NO_LOCALE */ diff --git a/chinese/tin/files/patch-cook.c b/chinese/tin/files/patch-cook.c deleted file mode 100644 index 53dfe5a73045..000000000000 --- a/chinese/tin/files/patch-cook.c +++ /dev/null @@ -1,20 +0,0 @@ ---- 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 */ - - /* diff --git a/chinese/tin/files/patch-misc.c b/chinese/tin/files/patch-misc.c deleted file mode 100644 index f188c2301cba..000000000000 --- a/chinese/tin/files/patch-misc.c +++ /dev/null @@ -1,22 +0,0 @@ ---- src/misc.c.orig Wed Jan 8 22:09:21 2003 -+++ src/misc.c Wed Jan 8 22:13:29 2003 -@@ -308,7 +308,7 @@ - */ - - while (fgets(buf, (int) sizeof(buf), fp_ip) != NULL) { -- if (!(tinrc.quote_style & QUOTE_SIGS) && !strcmp(buf, SIGDASHES) && !raw_data) -+ if (!(tinrc.quote_style & QUOTE_SIGS) && (!strcmp(buf, SIGDASHES) || !strcmp(buf, "--\n")) && !raw_data) - break; - if (strstr(prefix, "%s")) { /* initials wanted */ - if (buf[0] != '\n') { /* line is not empty */ -@@ -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 && c != 0x7f)); -+ 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)); diff --git a/chinese/tin/files/patch-page.c b/chinese/tin/files/patch-page.c deleted file mode 100644 index 2e3635d8b60d..000000000000 --- a/chinese/tin/files/patch-page.c +++ /dev/null @@ -1,11 +0,0 @@ ---- 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'; - -- cgit