Fix rest of errno issues in canna.

9 files changed, 111 insertions, 1 deletions

diff --git a/inputmethod/canna/distinfo b/inputmethod/canna/distinfo
index 6f7587d53f3..71798c52f49 100644
--- a/inputmethod/canna/distinfo
+++ b/inputmethod/canna/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.6 2005/12/29 15:29:11 joerg Exp $
+$NetBSD: distinfo,v 1.7 2005/12/30 15:16:21 joerg Exp $
 
 SHA1 (Canna36p4.tar.gz) = 4edc22e2e4e5c6db42daa2083fabb53aa1ae8168
 RMD160 (Canna36p4.tar.gz) = 7f8bb7f5d87e6b939ff2b84edf58072c75a5d09d
@@ -9,3 +9,11 @@ SHA1 (patch-ac) = a81a07db87d3b501dedd423e148a8e7e1d1804c4
 SHA1 (patch-ad) = d4b5720c206f81124e0d53e71590de86f66c524c
 SHA1 (patch-ae) = 9e8de536052d76d8aeeab2d443dc42450ae53947
 SHA1 (patch-af) = 2700fc8395895176c16562af66ea5bf0b13d4e10
+SHA1 (patch-ag) = cb435e54334ead8dba6a9ac9f14368d69d6e3a7c
+SHA1 (patch-ah) = 5d2f01fa4810dafa7a83d02edaec36fc274173fe
+SHA1 (patch-ai) = b44d683b2c1d489746f1174f8ae6d06ddca66a59
+SHA1 (patch-aj) = 30d19c8ef9c1129e5214cb9a8a1d8b2b636b0361
+SHA1 (patch-ak) = 18b408344b8b617142ced8804990e87b7ae27f56
+SHA1 (patch-al) = f6025d6fb7a3247ef44b0a50ae13b67ef3dad2d9
+SHA1 (patch-am) = 756aed6fc81a9d75a55d123c8dc00c0932b8df7f
+SHA1 (patch-an) = d639f774bf9ef440458bfc716b211a1dcc95a823
diff --git a/inputmethod/canna/patches/patch-ag b/inputmethod/canna/patches/patch-ag
new file mode 100644
index 00000000000..4511c95bbb3
--- /dev/null
+++ b/inputmethod/canna/patches/patch-ag
@@ -0,0 +1,13 @@
+$NetBSD: patch-ag,v 1.1 2005/12/30 15:16:21 joerg Exp $
+
+--- cmd/cannastat/cannastat.c.orig	2005-12-30 14:28:41.000000000 +0000
++++ cmd/cannastat/cannastat.c
+@@ -95,8 +95,6 @@ static IRwReq cRreq ;
+ static IRReq iRreq ;
+ static long cur_time ;	
+ 
+-extern int errno;
+-
+ static int
+ *TotalReqCount, OldTotalReqCount[ OLD_MAXREQUESTNO ],
+ ProtoCount,
diff --git a/inputmethod/canna/patches/patch-ah b/inputmethod/canna/patches/patch-ah
new file mode 100644
index 00000000000..650d07f02d6
--- /dev/null
+++ b/inputmethod/canna/patches/patch-ah
@@ -0,0 +1,13 @@
+$NetBSD: patch-ah,v 1.1 2005/12/30 15:16:21 joerg Exp $
+
+--- cmd/cshost/cshost.c.orig	2005-12-30 14:37:58.000000000 +0000
++++ cmd/cshost/cshost.c
+@@ -70,8 +70,6 @@ static IRReq iRreq ;
+ static int ServerFD ;
+ static int ProtocolVersion ;
+ 
+-extern int errno;
+-
+ main(argc, argv)
+ int argc ;
+ char **argv ;
diff --git a/inputmethod/canna/patches/patch-ai b/inputmethod/canna/patches/patch-ai
new file mode 100644
index 00000000000..ebc49f6c74f
--- /dev/null
+++ b/inputmethod/canna/patches/patch-ai
@@ -0,0 +1,13 @@
+$NetBSD: patch-ai,v 1.1 2005/12/30 15:16:21 joerg Exp $
+
+--- server/WaitFor.c.orig	2005-12-30 14:38:44.000000000 +0000
++++ server/WaitFor.c
+@@ -78,8 +78,6 @@ extern void CheckConnections();
+ extern void EstablishNewConnections();
+ extern void CheckSignal pro((void));
+ 
+-extern int errno;
+-
+ static int
+ _anyset(src)
+ long *src;
diff --git a/inputmethod/canna/patches/patch-aj b/inputmethod/canna/patches/patch-aj
new file mode 100644
index 00000000000..e555b027caa
--- /dev/null
+++ b/inputmethod/canna/patches/patch-aj
@@ -0,0 +1,13 @@
+$NetBSD: patch-aj,v 1.1 2005/12/30 15:16:21 joerg Exp $
+
+--- server/connection.c.orig	2005-12-30 14:39:13.000000000 +0000
++++ server/connection.c
+@@ -69,8 +69,6 @@ static char rcs_id[] = "$Id: connection.
+ #include "net.h"
+ #include "IR.h"
+ 
+-extern int errno;
+-
+ long *AllSockets;	   /* select on this */
+ long *AllClients;	   /* available clients */
+ long *LastSelectMask  ;    /* mask returned from last select call */
diff --git a/inputmethod/canna/patches/patch-ak b/inputmethod/canna/patches/patch-ak
new file mode 100644
index 00000000000..9aec5a04230
--- /dev/null
+++ b/inputmethod/canna/patches/patch-ak
@@ -0,0 +1,12 @@
+$NetBSD: patch-ak,v 1.1 2005/12/30 15:16:21 joerg Exp $
+
+--- server/convert.c.orig	2005-12-30 14:39:52.000000000 +0000
++++ server/convert.c
+@@ -57,7 +57,6 @@ static char rcs_id[] = "@(#) 102.1 $Id: 
+ #define IR_INT_INVAL(x) ((unsigned int)x > IR_INT_MAX)
+ 
+ extern void CheckSignal pro((void));
+-extern int  errno;
+ 
+ #ifdef DEBUGPROTO
+ static void
diff --git a/inputmethod/canna/patches/patch-al b/inputmethod/canna/patches/patch-al
new file mode 100644
index 00000000000..86e2b8b83f8
--- /dev/null
+++ b/inputmethod/canna/patches/patch-al
@@ -0,0 +1,12 @@
+$NetBSD: patch-al,v 1.1 2005/12/30 15:16:21 joerg Exp $
+
+--- server/wconvert.c.orig	2005-12-30 14:40:19.000000000 +0000
++++ server/wconvert.c
+@@ -84,7 +84,6 @@ static char rcs_id[] = "@(#) 102.1 $Id: 
+ #include "IR.h"
+ 
+ extern void CheckSignal pro((void));
+-extern int  errno;
+ 
+ typedef struct {
+ #ifdef __STDC__
diff --git a/inputmethod/canna/patches/patch-am b/inputmethod/canna/patches/patch-am
new file mode 100644
index 00000000000..714866e54d3
--- /dev/null
+++ b/inputmethod/canna/patches/patch-am
@@ -0,0 +1,13 @@
+$NetBSD: patch-am,v 1.1 2005/12/30 15:16:21 joerg Exp $
+
+--- server/misc.c.orig	2005-12-30 14:40:43.000000000 +0000
++++ server/misc.c
+@@ -75,8 +75,6 @@ extern void CheckConnections();
+ void
+ FatalError();
+ 
+-extern int  errno;
+-
+ #ifdef DEBUG
+ #define LOGFILE "/tmp/canna.log"
+ static FILE *ServerLogFp = (FILE *)0;
diff --git a/inputmethod/canna/patches/patch-an b/inputmethod/canna/patches/patch-an
new file mode 100644
index 00000000000..6d593e85140
--- /dev/null
+++ b/inputmethod/canna/patches/patch-an
@@ -0,0 +1,13 @@
+$NetBSD: patch-an,v 1.1 2005/12/30 15:16:21 joerg Exp $
+
+--- canuum/canna.c.orig	2005-12-30 14:56:11.000000000 +0000
++++ canuum/canna.c
+@@ -92,8 +92,6 @@ static char rcsid[] = "$Id: canna.c,v 1.
+ #define PARTIALREDRAW 1
+ #define NOREDRAW      0
+ 
+-extern	int	errno;
+-
+ static int maxmodelen;
+ static int maxwidth = 0;
+