From 40a684ff1e8608bde986585a735e66d9a456e675 Mon Sep 17 00:00:00 2001
From: Daichi GOTO <daichi@FreeBSD.org>
Date: Tue, 24 May 2005 12:37:50 +0000
Subject: IIIMF-related ports:     - drop maintainership     - update to r12.2 
    - some bug fixes

PR:		81184
Submitted by:	Masanori OZAWA <ozawa@ongs.co.jp>
Approved by:	maintainer
---
 .../files/patch-leif_freewnn_freewnn.c             | 126 +++++++++++++++++++--
 1 file changed, 117 insertions(+), 9 deletions(-)

(limited to 'japanese/iiimf-le-freewnn/files/patch-leif_freewnn_freewnn.c')

diff --git a/japanese/iiimf-le-freewnn/files/patch-leif_freewnn_freewnn.c b/japanese/iiimf-le-freewnn/files/patch-leif_freewnn_freewnn.c
index 255f856ea558..e7b91d4f17c0 100644
--- a/japanese/iiimf-le-freewnn/files/patch-leif_freewnn_freewnn.c
+++ b/japanese/iiimf-le-freewnn/files/patch-leif_freewnn_freewnn.c
@@ -1,18 +1,15 @@
---- leif/freewnn/freewnn.c.orig	Mon Oct  4 19:13:52 2004
-+++ leif/freewnn/freewnn.c	Sun Feb 20 15:43:20 2005
-@@ -59,9 +59,9 @@
+--- leif/freewnn/freewnn.c.orig	Sun Mar 20 11:41:29 2005
++++ leif/freewnn/freewnn.c	Wed May 18 01:20:56 2005
+@@ -59,7 +59,7 @@
  #define BUFSIZE 1024
  #endif
  
 -#define WNNRCFILE "/etc/FreeWnn/ja/wnnenvrc"
-+#define WNNRCFILE (LOCALBASE "/lib/wnn/ja_JP/wnnenvrc")
++#define WNNRCFILE "%%LOCALBASE%%" "/lib/wnn/ja_JP/wnnenvrc"
  
--#define CSC_PATH "/usr/lib/im/csconv/csconv.so"
-+#define CSC_PATH (IMDIR "/csconv/csconv.so")
  #define CSC_OPEN_LOCALE "csconv_open_locale"
  #define CSC_OPEN        "csconv_open"
- #define CSC_CONV        "csconv"
-@@ -163,7 +163,7 @@
+@@ -162,7 +162,7 @@
    int count = 0;
  
    if( str == NULL ) return NULL;
@@ -21,7 +18,7 @@
  
    for(i=0;i<strlen(str);i++) {
      count++;
-@@ -202,7 +202,7 @@
+@@ -201,7 +201,7 @@
  
    if( wstr == NULL ) return NULL;
  
@@ -30,3 +27,114 @@
  
    for(i=0;wstr[i] != 0;i++) 
      count++;
+@@ -388,14 +388,14 @@
+ 
+ UTFCHAR*
+ UTF8_to_UTFCHAR(unsigned char* str) {
+-  UTFCHAR *p, *ustr = NULL;
++  UTFCHAR *ustr = NULL;
+   int len, ulen;
+ 
+   const char *csc_arg_str_ccp; /* For compiler optimization */
+   char *csc_arg_str_cp; /* For compiler optimization */
+ 
+   if( str == NULL ) return NULL;
+-  if( *str == '\0' ) return NULL;
++  if( *str == '\0' ) return "";
+ 
+   if( csconv_utf8_cd == NULL ) {
+     csconv_utf8_cd = csc_open("UTF-16", "UTF-8");
+@@ -408,30 +408,34 @@
+   len = strlen(str);
+ 
+   ulen = sizeof(UTFCHAR)*(len+1);
+-  p = ustr = (UTFCHAR*)calloc(len+1, sizeof(UTFCHAR));
++  ustr = (UTFCHAR*)malloc(ulen);
++  if (!ustr) return NULL;
++  memset(ustr, 0, ulen);
++  ulen--;
+ 
+   /* Below 2 lines are to prevent gcc's warning and for the sake
+      of compiler optimization */
+   csc_arg_str_ccp = (const char*)str;
+   csc_arg_str_cp = (char*)ustr;
+ 
+-  csc_conv(csconv_utf8_cd, &csc_arg_str_ccp, &len, &csc_arg_str_cp, &ulen);
+-
+-  *ustr = 0;
++  if ((size_t)-1 == csc_conv(csconv_utf8_cd, &csc_arg_str_ccp, &len, &csc_arg_str_cp, &ulen)) {
++    free(ustr);
++    return NULL;
++  }
+ 
+-  return p;
++  return ustr;
+ }
+ 
+ UTFCHAR*
+ euc2UTFCHAR(unsigned char* str) {
+-  UTFCHAR *p, *ustr = NULL;
++  UTFCHAR *ustr = NULL;
+   int len, ulen;
+ 
+   const char *csc_arg_str_ccp; /* For compiler optimization */
+   char *csc_arg_str_cp; /* For compiler optimization */
+ 
+   if( str == NULL ) return NULL;
+-  if( *str == '\0' ) return NULL;
++  if( *str == '\0' ) return "";
+ 
+   if( csconv_cd == NULL ) {
+     csconv_cd = csc_open_locale("ja_JP.eucJP", "UTF-16", "MultiByte");
+@@ -444,18 +448,22 @@
+   len = strlen(str);
+ 
+   ulen = sizeof(UTFCHAR)*(len+1);
+-  p = ustr = (UTFCHAR*)calloc(len+1, sizeof(UTFCHAR));
++  ustr = (UTFCHAR*)malloc(ulen);
++  if (!ustr) return NULL;
++  memset(ustr, 0, ulen);
++  ulen--;
+ 
+   /* Below 2 lines are to prevent gcc's warning and for the sake
+      of compiler optimization */
+   csc_arg_str_ccp = (const char*)str;
+   csc_arg_str_cp = (char*)ustr;
+ 
+-  csc_conv(csconv_cd, &csc_arg_str_ccp, &len, &csc_arg_str_cp, &ulen);
+-
+-  *ustr = 0;
++  if ((size_t)-1 == csc_conv(csconv_cd, &csc_arg_str_ccp, &len, &csc_arg_str_cp, &ulen)) {
++    free(ustr);
++    return NULL;
++  }
+ 
+-  return p;
++  return ustr;
+ }
+ 
+ IMText*
+@@ -466,7 +474,10 @@
+   ustr = UTF8_to_UTFCHAR(str);
+ 
+   p = create_IMText(s, ustrlen(ustr));
+-  memcpy(p->text.utf_chars, ustr, (ustrlen(ustr)+1)*sizeof(UTFCHAR));
++  if (p && ustr) {
++    memcpy(p->text.utf_chars, ustr, (ustrlen(ustr)+1)*sizeof(UTFCHAR));
++  }
++  if (ustr) free(ustr);
+ 
+   return p;
+ }
+@@ -479,7 +490,10 @@
+   ustr = euc2UTFCHAR(str);
+ 
+   p = create_IMText(s, ustrlen(ustr));
+-  memcpy(p->text.utf_chars, ustr, (ustrlen(ustr)+1)*sizeof(UTFCHAR));
++  if (p && ustr) {
++    memcpy(p->text.utf_chars, ustr, (ustrlen(ustr)+1)*sizeof(UTFCHAR));
++  }
++  if (ustr) free(ustr);
+ 
+   return p;
+ }
-- 
cgit v1.2.3