summaryrefslogtreecommitdiff
path: root/chat
diff options
context:
space:
mode:
authormrg <mrg@pkgsrc.org>2001-10-02 14:13:38 +0000
committermrg <mrg@pkgsrc.org>2001-10-02 14:13:38 +0000
commit67fd12d7c9d88d533c455dbdf44f4916594604a7 (patch)
treee7cd03c76fe15a66f3b5e15ac4ad84b6b4474cb6 /chat
parentf8859b49030e8b3ba1d14139b98c5b77eced2676 (diff)
downloadpkgsrc-67fd12d7c9d88d533c455dbdf44f4916594604a7.tar.gz
fix a "resize smaller" core dump; from ircii-current.
Diffstat (limited to 'chat')
-rw-r--r--chat/ircII/distinfo3
-rw-r--r--chat/ircII/patches/patch-ab95
2 files changed, 97 insertions, 1 deletions
diff --git a/chat/ircII/distinfo b/chat/ircII/distinfo
index 4af67389698..7b2212d8454 100644
--- a/chat/ircII/distinfo
+++ b/chat/ircII/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.5 2001/07/15 12:22:16 jlam Exp $
+$NetBSD: distinfo,v 1.6 2001/10/02 14:13:38 mrg Exp $
SHA1 (ircii-20010612.tar.bz2) = 04189908de744956a66530d77d97c452927bb876
Size (ircii-20010612.tar.bz2) = 522912 bytes
SHA1 (patch-aa) = 80aa471bcb6f864bed32117ed437d9d1ca9aa1ee
+SHA1 (patch-ab) = a9d84f59c73560c1d738cb3d9eb35486c75574a9
SHA1 (patch-ac) = 0afd36f3ad2247b0d42dfebab210822dd5dfe151
diff --git a/chat/ircII/patches/patch-ab b/chat/ircII/patches/patch-ab
new file mode 100644
index 00000000000..90c38c2a6b4
--- /dev/null
+++ b/chat/ircII/patches/patch-ab
@@ -0,0 +1,95 @@
+$NetBSD: patch-ab,v 1.5 2001/10/02 14:13:38 mrg Exp $
+
+Index: source/screen.c
+===================================================================
+RCS file: /home/cvs/ircii/source/screen.c,v
+retrieving revision 1.119
+retrieving revision 1.121
+diff -p -c -r1.119 -r1.121
+*** source/screen.c 2001/05/19 20:57:36 1.119
+--- source/screen.c 2001/07/20 00:42:39 1.121
+*************** output_line(str, result, startpos)
+*** 688,695 ****
+ /* parse all consequent colour settings */
+ int fg, bg;
+
+! fg = *++ptr - 1;
+! bg = *++ptr - 1;
+ if (fg < 16)
+ fgcolour = fg;
+ if (bg < 16)
+--- 688,705 ----
+ /* parse all consequent colour settings */
+ int fg, bg;
+
+! if (!*++ptr)
+! {
+! str = ptr;
+! break;
+! }
+! fg = *ptr - 1;
+! if (!*++ptr)
+! {
+! str = ptr;
+! break;
+! }
+! bg = *ptr - 1;
+ if (fg < 16)
+ fgcolour = fg;
+ if (bg < 16)
+*************** output_line(str, result, startpos)
+*** 712,719 ****
+ }
+ if (written > CO)
+ len = len - (written - CO);
+! if (!startpos)
+! fwrite(str, len, 1, current_screen->fpout);
+
+ if (!underline)
+ {
+--- 722,729 ----
+ }
+ if (written > CO)
+ len = len - (written - CO);
+! if (!startpos && len > 0)
+! fwrite(str, (size_t)len, 1, current_screen->fpout);
+
+ if (!underline)
+ {
+*************** output_line(str, result, startpos)
+*** 747,758 ****
+ }
+ if (written > CO)
+ len = len - (written - CO);
+! if (!startpos)
+! fwrite(str, len, 1, current_screen->fpout);
+ do
+ {
+! charset_type = *++ptr;
+! charset = *++ptr;
+ } while (ptr[1] == CHARSET_TAG && ptr++);
+ display_charset(charset_type, charset);
+ str = ++ptr;
+--- 757,778 ----
+ }
+ if (written > CO)
+ len = len - (written - CO);
+! if (!startpos && len > 0)
+! fwrite(str, (size_t)len, 1, current_screen->fpout);
+ do
+ {
+! if (!*++ptr)
+! {
+! str = ptr;
+! break;
+! }
+! charset_type = *ptr;
+! if (!*++ptr)
+! {
+! str = ptr;
+! break;
+! }
+! charset = *ptr;
+ } while (ptr[1] == CHARSET_TAG && ptr++);
+ display_charset(charset_type, charset);
+ str = ++ptr;