diff -ru /wk-wnn-test/base-src/Xsi/Wnn/etc/msg.c /wk-wnn-test/fixed-src/Xsi/Wnn/etc/msg.c
--- /wk-wnn-test/base-src/Xsi/Wnn/etc/msg.c	Fri Aug 19 09:58:52 1994
+++ /wk-wnn-test/fixed-src/Xsi/Wnn/etc/msg.c	Thu Jul  9 17:29:48 1998
@@ -52,6 +52,8 @@
 #include <stdio.h>
 #include "commonhd.h"
 #include "wnn_os.h"
+
+#include "wnn_malloc.h"
 #include "msg.h"
 
 extern char *getenv();
@@ -295,9 +297,13 @@
 	}
     }
 
-    if (!(cd = (struct msg_cat *)malloc(sizeof(struct msg_cat))))
+/* printf("malloc_ready_msg.c\n"); */
+
+    if (!(cd = (struct msg_cat *)malloc0(sizeof(struct msg_cat))))
 	return(NULL);
 
+/* printf("get  memory\n"); */
+
     strcpy(cd->name, name);
     strcpy(cd->lang, l);
     strcpy(cd->nlspath, nlspath);
@@ -324,9 +330,9 @@
 
     cd->msg_cnt = msg_cnt;
     if (!(bd = cd->msg_bd = (struct msg_bd *)
-	       malloc((sizeof(struct msg_bd)) * msg_cnt + msg_byte + 1))) {
+	       malloc0((sizeof(struct msg_bd)) * msg_cnt + msg_byte + 1))) {
 	fclose(fp);
-	free(cd);
+	free0(cd);
 	return(NULL);
     }
     msg = (char *) bd + (sizeof(struct msg_bd)) * msg_cnt;
@@ -353,6 +359,8 @@
     return(cd);
 }
 
+ char ret[128];
+
 char *
 msg_get(catd, id, msg, lang)
 struct msg_cat *catd;
@@ -361,7 +369,7 @@
 register char	*lang;
 {
     register struct msg_cat *cd;
-    char ret[128];
+/*    char ret[128];*/
     register char *msg_bd;
 
     if(catd == 0)
@@ -387,7 +395,7 @@
     if(msg != 0 && *msg != '\0')
 	return(msg);
     sprintf(ret, "mes_id = %d: %s", id, DEF_MSG);
-    return(ret);
+    return ret;
 }
 
 void
@@ -397,9 +405,9 @@
     if(cd->nextp)
 	msg_close(cd->nextp);
     if(cd->msg_bd)
-	free(cd->msg_bd);
+	free0(cd->msg_bd);
     if(cd)
-	free(cd);
+	free0(cd);
 }
 
 #ifdef	not_use
diff -ru /wk-wnn-test/base-src/Xsi/Wnn/etc/strings.c /wk-wnn-test/fixed-src/Xsi/Wnn/etc/strings.c
--- /wk-wnn-test/base-src/Xsi/Wnn/etc/strings.c	Wed Mar  3 16:41:51 1993
+++ /wk-wnn-test/fixed-src/Xsi/Wnn/etc/strings.c	Thu Jul  9 00:25:12 1998
@@ -55,7 +55,9 @@
 #include "commonhd.h"
 #include "wnn_string.h"
 
+#ifndef NULL
 #define NULL	0
+#endif
 
 #define is_half_width(c)	(! is_full_width(c))
 #define is_full_width(c)	(((c) & 0xff00))
diff -ru /wk-wnn-test/base-src/Xsi/Wnn/include/wnn_malloc.h /wk-wnn-test/fixed-src/Xsi/Wnn/include/wnn_malloc.h
--- /wk-wnn-test/base-src/Xsi/Wnn/include/wnn_malloc.h	Tue Sep 17 06:30:10 1991
+++ /wk-wnn-test/fixed-src/Xsi/Wnn/include/wnn_malloc.h	Wed Jul  8 08:18:30 1998
@@ -54,7 +54,7 @@
 extern void free0();
 extern char *realloc0();
 
-#define	malloc(s)	malloc0(s)
-#define	free(p)		free0(p)
-#define	realloc(p,s)	realloc0(p,s)
+/*#define	malloc(s)	malloc0(s)*/
+/*#define	free(p)		free0(p)*/
+/*#define	realloc(p,s)	realloc0(p,s)*/
 #endif	/* WNN_MALLOC */
diff -ru /wk-wnn-test/base-src/Xsi/Wnn/jlib/jl.c /wk-wnn-test/fixed-src/Xsi/Wnn/jlib/jl.c
--- /wk-wnn-test/base-src/Xsi/Wnn/jlib/jl.c	Fri Aug 19 10:30:50 1994
+++ /wk-wnn-test/fixed-src/Xsi/Wnn/jlib/jl.c	Thu Jul  9 02:08:18 1998
@@ -68,6 +68,8 @@
 
 #include "wnnerror.h"
 #include "jd_sock.h"
+
+#include "wnn_malloc.h"
 #include "jslib.h"
 #include "jllib.h"
 
@@ -355,7 +357,7 @@
 register char *name;
 {
     register struct wnn_file_name_id *f, *f1;
-    if((f = (struct wnn_file_name_id *)malloc(sizeof(struct wnn_file_name_id) +
+    if((f = (struct wnn_file_name_id *)malloc0(sizeof(struct wnn_file_name_id) +
 					     strlen(name) + 1)) == NULL){
 	wnn_errorno=WNN_ALLOC_FAIL;	return(-1);
     }
@@ -397,7 +399,7 @@
     for(prev = &jl_env_p->file; f = *prev; prev = &f->next){
 	if (f->id == id) {
 	    *prev = f->next;
-	    free(f);
+	    free0(f);
 	    return(0);
 	}
     }
@@ -537,10 +539,10 @@
     struct wnn_env *env;
 
     wnn_errorno = 0;
-    if(rb.size == 0) rb.buf = (char *)malloc((unsigned)(rb.size = 1024));
+    if(rb.size == 0) rb.buf = (char *)malloc0((unsigned)(rb.size = 1024));
 
 #define ALLOC_SET(pter, type, size, size_var) \
-    ((pter) = ((type *)malloc((unsigned)(sizeof(type) * ((size_var) = (size))))))
+    ((pter) = ((type *)malloc0((unsigned)(sizeof(type) * ((size_var) = (size))))))
 
     if(!ALLOC_SET(buf, struct wnn_buf, 1, dmy)){
 	wnn_errorno=WNN_ALLOC_FAIL;return NULL;
@@ -587,7 +589,7 @@
     char **c;
     register WNN_BUN *d;
 
-    if((c =(char **)malloc((unsigned)(len * sizeof(WNN_BUN) + sizeof(char *)))) == NULL){
+    if((c =(char **)malloc0((unsigned)(len * sizeof(WNN_BUN) + sizeof(char *)))) == NULL){
 	wnn_errorno=WNN_ALLOC_FAIL;	return(-1);
     }
 
@@ -616,15 +618,15 @@
 	buf->env = 0;
     }
 
-    if(buf->bun) free((char *)buf->bun);
-    if(buf->zenkouho) free((char *)buf->zenkouho);
-    if(buf->zenkouho_dai) free((char *)buf->zenkouho_dai);
-    if(buf->down_bnst) free((char *)buf->down_bnst);
+    if(buf->bun) free0((char *)buf->bun);
+    if(buf->zenkouho) free0((char *)buf->zenkouho);
+    if(buf->zenkouho_dai) free0((char *)buf->zenkouho_dai);
+    if(buf->down_bnst) free0((char *)buf->down_bnst);
     for(c = buf->heap; c; c = next) {
 	next = *(char **)c;
-	free(c);
+	free0(c);
     }
-    free((char *)buf);
+    free0((char *)buf);
 }
 
 /*
@@ -1886,7 +1888,7 @@
 
     newsize = buf->bun_suu + cnt - (bun_no2 - bun_no);
 
-#define Realloc(a, b) realloc((char *)(a), (unsigned)(b))
+#define Realloc(a, b) realloc0((char *)(a), (unsigned)(b))
 
     if(newsize > buf->msize_bun){
 	buf->bun = (WNN_BUN **)Realloc(buf->bun, newsize * sizeof(WNN_BUN *));
@@ -2698,7 +2700,7 @@
 
     total = 0;
     flag = 0;
-    while(*st != NULL){
+    while(*st != 0){
 	if (isdigit(*st)){
 	    total = total * 10 + (*st - '0');
 	} else if (*st == '+') {
diff -ru /wk-wnn-test/base-src/Xsi/Wnn/jlib/js.c /wk-wnn-test/fixed-src/Xsi/Wnn/jlib/js.c
--- /wk-wnn-test/base-src/Xsi/Wnn/jlib/js.c	Tue Jul  7 20:10:48 1998
+++ /wk-wnn-test/fixed-src/Xsi/Wnn/jlib/js.c	Thu Jul  9 04:29:41 1998
@@ -71,7 +71,7 @@
 */
 
 
-extern	char	*malloc();
+extern	char	*malloc0();
 
 #include <stdio.h>
 #include <ctype.h>
@@ -95,6 +95,8 @@
 
 #include "wnnerror.h"
 /*#include "commonhd.h"*/
+
+#include "wnn_malloc.h"
 #include "jslib.h"
 #include "jh.h"
 
@@ -104,7 +106,7 @@
 #include "../etc/bdic.c"
 #include "../etc/pwd.c"
 
-char *malloc();
+char *malloc0();
 
 #ifdef SYSVR2
 #define	bzero(adr,n)	memset((adr),0,(n))
@@ -607,7 +609,7 @@
     }
  }
  sbp=0;	/* init sndBufPointer */
- if(!(new_js=(char *)malloc(sizeof(WNN_JSERVER_ID)))){
+ if(!(new_js=(char *)malloc0(sizeof(WNN_JSERVER_ID)))){
  				wnn_errorno=WNN_ALLOC_FAIL;return NULL;
  }
  current_js =(WNN_JSERVER_ID *) new_js;
@@ -627,14 +629,14 @@
  if(server == NULL || 0==strcmp(server,"") || 0==strcmp(server,"unix")){
    strcpy(host,"unix");
    if((current_sd= cd_open(lang))==-1){
-	wnn_errorno=WNN_SOCK_OPEN_FAIL;free((char*)current_js);current_js=NULL;
+	wnn_errorno=WNN_SOCK_OPEN_FAIL;free0((char*)current_js);current_js=NULL;
 	return NULL;
    }
  }else{
    gethostname(host,WNN_HOSTLEN);
    host[WNN_HOSTLEN-1] = '\0';	/* truncate by WNN_HOSTLEN */
    if((current_sd= cd_open_in(server, lang, timeout))==-1){
-	wnn_errorno=WNN_SOCK_OPEN_FAIL;free((char*)current_js);current_js=NULL;
+	wnn_errorno=WNN_SOCK_OPEN_FAIL;free0((char*)current_js);current_js=NULL;
 	return NULL;
    }
  }
@@ -666,7 +668,7 @@
  WNN_JSERVER_ID tmp_js_id;
  if(server==0) return(-1);
  tmp_js_id = *server;
- free((char *)server);
+ free0((char *)server);
  current_js = &tmp_js_id;
  current_sd = current_js->sd;
 /*	handler of jserver dead */
@@ -697,7 +699,7 @@
     void js_set_lang();
 
     set_current_js(server);
-    if(!(env=(struct wnn_env *)malloc(sizeof(struct wnn_env)))){
+    if(!(env=(struct wnn_env *)malloc0(sizeof(struct wnn_env)))){
 	    wnn_errorno=WNN_ALLOC_FAIL;return NULL;
     }
     handler_of_jserver_dead(NULL);
@@ -705,7 +707,7 @@
     putscom(env_name);
     snd_flush();
     e_id=get4com();
-    if(e_id==-1){ wnn_errorno= get4com(); free(env); return NULL; }
+    if(e_id==-1){ wnn_errorno= get4com(); free0(env); return NULL; }
     env->env_id = e_id;
     env->js_id  = server;
     strcpy(env->lang, lang);        /* set language name */
@@ -793,7 +795,7 @@
  free((char *)env);
  */
  set_current_js(env->js_id);
- handler_of_jserver_dead(NULL);
+ handler_of_jserver_dead(0);
  snd_env_head(&tmp_env,JS_DISCONNECT);
  snd_flush();
  x=get4com();
@@ -2201,8 +2203,8 @@
 {
  if(ret->size < size){
 	if(ret->buf)
-	    free((char *)ret->buf);
-	ret->buf = malloc(size);
+	    free0((char *)ret->buf);
+	ret->buf = malloc0(size);
 	ret->size = size;
  }
 }
@@ -2610,3 +2612,6 @@
 	return(atoi(port_char));
     }
 }
+
+
+#include "../jserver/malloc.c"
\ No newline at end of file
diff -ru /wk-wnn-test/base-src/Xsi/Wnn/jlib/kankana.c /wk-wnn-test/fixed-src/Xsi/Wnn/jlib/kankana.c
--- /wk-wnn-test/base-src/Xsi/Wnn/jlib/kankana.c	Fri Jul 24 16:09:26 1992
+++ /wk-wnn-test/fixed-src/Xsi/Wnn/jlib/kankana.c	Wed Jul  8 08:22:28 1998
@@ -49,6 +49,8 @@
 /*	Version 4.1
 */
 #include <stdio.h>
+
+#include "wnn_malloc.h"
 #include "jslib.h"
 
 #define FZK_FILE "pubdic/full.fzk"
@@ -64,6 +66,8 @@
 char yomi[1024];
 char kanji[5000];
 
+extern char *malloc0();
+
 int kihon_file, setto_file, rev_file, fzk_file, rev_setto_file;
 int kihon_dic_no, setto_dic_no, rev_dic_no, rev_setto_dic_no;
 
@@ -72,7 +76,7 @@
 char **argv;
 {
     char *mname = "";
-    rb.buf = (char *)malloc((unsigned)(rb.size = 0));
+    rb.buf = (char *)malloc0((unsigned)(rb.size = 0));
     if(argc > 1) mname = argv[1];
 
     if((js=js_open(mname, 0)) == NULL)
diff -ru /wk-wnn-test/base-src/Xsi/Wnn/jlib.V3/jlv3.c /wk-wnn-test/fixed-src/Xsi/Wnn/jlib.V3/jlv3.c
--- /wk-wnn-test/base-src/Xsi/Wnn/jlib.V3/jlv3.c	Fri Aug 19 10:31:01 1994
+++ /wk-wnn-test/fixed-src/Xsi/Wnn/jlib.V3/jlv3.c	Wed Jul  8 08:23:19 1998
@@ -75,11 +75,13 @@
 #include <fcntl.h>
 #include <pwd.h>
 #ifdef	SYSVR2
-#include <malloc.h>
+/*#include <malloc.h>*/
 #else
-extern char *malloc();
+extern char *malloc0();
 #endif
 
+#include "wnn_malloc.h"
+
 #include "jllib.h"
 #include "jlib.h"
 #include "wnnerror.h"
@@ -107,7 +109,7 @@
     buf->env->js_id->js_dead_env_flg = 1;			\
     if (setjmp(buf->env->js_id->js_dead_env) == 666) {		\
 	if (jlib_work_area) {					\
-	    free(jlib_work_area);				\
+	    free0(jlib_work_area);				\
 	    jlib_work_area = NULL;}				\
 	jl_close(buf);						\
 	if (jd_server_dead_env_flg)				\
@@ -147,7 +149,7 @@
 jd_close()
 {
     if (jlib_work_area) {
-	free(jlib_work_area);
+	free0(jlib_work_area);
 	jlib_work_area = NULL;
     }
     if(jl_dic_save_all(buf) < 0)
@@ -655,7 +657,7 @@
     WNN_FILE_INFO_STRUCT   *files;
 
     if (jlib_work_area != NULL)
-	free(jlib_work_area);
+	free0(jlib_work_area);
     jlib_work_area = NULL;
 
     if (user == NULL || *user == '\0') {	/* ENV name */
@@ -669,7 +671,7 @@
     kasz = (sizeof(w_char)*(kana_len + 1) + 7) & 0xfffffff8;
     klsz = (sizeof(KOUHO_ENT)*(klist_len + 1) + 7) & 0xfffffff8;
     kjsz = (sizeof(w_char)*kanji_len + 7) & 0xfffffff8;
-    if(!(jlib_work_area = malloc(kasz+klsz+kjsz))){
+    if(!(jlib_work_area = malloc0(kasz+klsz+kjsz))){
 	wnn_errorno = WNN_MALLOC_INITIALIZE;return 0;
     }
     bun.klist = (KOUHO_ENT *)jlib_work_area;
diff -ru /wk-wnn-test/base-src/Xsi/Wnn/jserver/b_index.c /wk-wnn-test/fixed-src/Xsi/Wnn/jserver/b_index.c
--- /wk-wnn-test/base-src/Xsi/Wnn/jserver/b_index.c	Tue Jun 28 11:06:49 1994
+++ /wk-wnn-test/fixed-src/Xsi/Wnn/jserver/b_index.c	Wed Jul  8 08:23:56 1998
@@ -60,6 +60,7 @@
 #include "commonhd.h"
 #include "de_header.h"
 #include "jdata.h"
+#include "wnn_malloc.h"
 
 #ifdef CONVERT_by_STROKE
 /*******  Create B_dic index 	*********************************************/	
@@ -78,7 +79,7 @@
 
 	/* Make Space of b_nodes */
 	jt->bind = ( struct b_node * )
-		malloc( 2 * jt->bufsize_ri1[0] * sizeof(struct b_node) );
+		malloc0( 2 * jt->bufsize_ri1[0] * sizeof(struct b_node) );
 
 		/*  If the bind size is determined in atod, we use the
 		    following statement instead of the above  
diff -ru /wk-wnn-test/base-src/Xsi/Wnn/jserver/daibn_kai.c /wk-wnn-test/fixed-src/Xsi/Wnn/jserver/daibn_kai.c
--- /wk-wnn-test/base-src/Xsi/Wnn/jserver/daibn_kai.c	Wed Jul  8 10:24:27 1998
+++ /wk-wnn-test/fixed-src/Xsi/Wnn/jserver/daibn_kai.c	Wed Jul  8 22:00:56 1998
@@ -245,7 +245,7 @@
 	} else {
 		if(
 #ifndef	NO_FZK
-		    (fzkchar == NULL || *fzkchar == NULL) &&
+		    (fzkchar ==(w_char *) NULL || *fzkchar ==(w_char ) NULL) &&
 #endif	/* NO_FZK */
 		    beginvect == sentou_no) {
 			*status = WNN_SENTOU;
@@ -300,7 +300,7 @@
     }
 #ifndef NO_FZK
     else {
-	if (fzkchar == NULL || *fzkchar == NULL) {
+	if (fzkchar ==(w_char *) NULL || *fzkchar ==(w_char ) NULL) {
 	    if ((ll = wnn_get_fukugou_component_body(hinsi, &buf)) == 0) {
 		    error1("wnn_get_fukugou_component:error in zentan_able.");
 		return (-1);
diff -ru /wk-wnn-test/base-src/Xsi/Wnn/jserver/de.c /wk-wnn-test/fixed-src/Xsi/Wnn/jserver/de.c
--- /wk-wnn-test/base-src/Xsi/Wnn/jserver/de.c	Fri Aug 19 10:31:23 1994
+++ /wk-wnn-test/fixed-src/Xsi/Wnn/jserver/de.c	Thu Jul  9 02:41:50 1998
@@ -187,8 +187,8 @@
 char cmd_name[80];
 
 /* No arguments are used. Only options. */
-void
-main(argc, argv)
+
+int main(argc, argv)
 int argc;
 char **argv;
 {
@@ -285,6 +285,8 @@
 	demon_main();
 
  demon_fin();
+
+ return 0;
 }
 
 static void
@@ -322,9 +324,9 @@
 	nofile = NOFILE;
 	sel_w = (nofile-1)/BINTSIZE + 1;
 	all_socks   = (int *)calloc( sel_w,(sizeof(int)));
-	ready_socks = (int *)malloc( sel_w*(sizeof(int)));
-	dummy1_socks= (int *)malloc( sel_w*(sizeof(int)));
-	dummy2_socks= (int *)malloc( sel_w*(sizeof(int)));
+	ready_socks = (int *)malloc0( sel_w*(sizeof(int)));
+	dummy1_socks= (int *)malloc0( sel_w*(sizeof(int)));
+	dummy2_socks= (int *)malloc0( sel_w*(sizeof(int)));
 	sel_width = sel_w*sizeof(int);	/* byte width */
 	sel_bwidth = sel_width*8;	/* bit width */
 }
@@ -340,7 +342,7 @@
     top:
 	errno = 0;
 	if((no_of_ready_socks
-		=select(nofile,ready_socks,dummy1_socks,dummy2_socks,0))==-1){
+		=select(nofile,(__fd_set *)ready_socks,(__fd_set*)dummy1_socks,(__fd_set*)dummy2_socks,0))==-1){
 	        if(errno == EINTR) goto top;
 		xerror("select error");
 	}
@@ -451,12 +453,12 @@
 	signal(SIGQUIT,SIG_IGN);
 
 
-	if((cblk =(COMS_BLOCK *)malloc(max_client * sizeof(COMS_BLOCK)))
+	if((cblk =(COMS_BLOCK *)malloc0(max_client * sizeof(COMS_BLOCK)))
 	   == NULL){
 	    perror("Malloc for cblk");
 	    exit(1);
 	}
-	if((client =(CLIENT *)malloc(max_client * sizeof(CLIENT)))
+	if((client =(CLIENT *)malloc0(max_client * sizeof(CLIENT)))
 	   == NULL){
 	    perror("Malloc for client");
 	    exit(1);
diff -ru /wk-wnn-test/base-src/Xsi/Wnn/jserver/do_env.c /wk-wnn-test/fixed-src/Xsi/Wnn/jserver/do_env.c
--- /wk-wnn-test/base-src/Xsi/Wnn/jserver/do_env.c	Wed Apr 28 09:25:54 1993
+++ /wk-wnn-test/fixed-src/Xsi/Wnn/jserver/do_env.c	Wed Jul  8 03:29:01 1998
@@ -172,9 +172,9 @@
  if((eid = disconnect_last_sticky()) < 0)
      return -1;	/* no more env */
 new:
- if((ne= (struct cnv_env *)malloc(sizeof(struct cnv_env)))==0) return -1;
+ if((ne= (struct cnv_env *)malloc0(sizeof(struct cnv_env)))==0) return -1;
  env[eid]=ne; new_env(eid,n);
- if(add_env_to_client(eid) == -1){free(ne); env[eid]=NULL; return -1;}
+ if(add_env_to_client(eid) == -1){free0(ne); env[eid]=NULL; return -1;}
  error1("new_env: Created , %s env_id=%d\n",n,eid);
  return eid;
 }
@@ -315,7 +315,7 @@
     }
     del_all_dic_in_env(eid);
     del_all_file_in_env(eid);
-    free(env[eid]); env[eid]=NULL;
+    free0(env[eid]); env[eid]=NULL;
     error1("disconnect: Free eid=%d\n",eid);
 }
 
@@ -339,7 +339,7 @@
 	sticky_cnt--;
 	del_all_dic_in_env(eid);
 	del_all_file_in_env(eid);
-	free(env[eid]); env[eid]=NULL;
+	free0(env[eid]); env[eid]=NULL;
 	error1("disconnect sticky Env: Free eid=%d\n",eid);
     }
     return (eid);
diff -ru /wk-wnn-test/base-src/Xsi/Wnn/jserver/fzk.c /wk-wnn-test/fixed-src/Xsi/Wnn/jserver/fzk.c
--- /wk-wnn-test/base-src/Xsi/Wnn/jserver/fzk.c	Tue Jul  7 20:10:47 1998
+++ /wk-wnn-test/fixed-src/Xsi/Wnn/jserver/fzk.c	Wed Jul  8 22:15:33 1998
@@ -193,7 +193,7 @@
 		error1( "KANGO vector kosuu is more than KANGO hinsi suu\n");
 		return(NULL);
 	}
-	if ((fzk_tbl = (struct FT *)malloc(sizeof(struct FT))) == NULL) {
+	if ((fzk_tbl = (struct FT *)malloc0(sizeof(struct FT))) == NULL) {
 		wnn_errorno = WNN_MALLOC_ERR;
 		error1( "malloc error in fzk\n");
 		return(NULL);
@@ -208,7 +208,7 @@
 	fzk_tbl->fzklength = fzklength;
 
 	if ((fzk_tbl->vect_area =
-	    (struct fzkvect *) malloc(sizeof (struct fzkvect) * fzkvect_kosuu)) == NULL) {
+	    (struct fzkvect *) malloc0(sizeof (struct fzkvect) * fzkvect_kosuu)) == NULL) {
 		wnn_errorno = WNN_MALLOC_ERR;
 		error1( "malloc error in fzk\n");
 		fzk_discard(fzk_tbl);
@@ -217,14 +217,14 @@
 #endif	/* NO_FZK */
 
 	if ((fzk_tbl->kango_hinsi_area =
-	    (int *) malloc(sizeof (int) * kango_length)) == NULL) {
+	    (int *) malloc0(sizeof (int) * kango_length)) == NULL) {
 		wnn_errorno = WNN_MALLOC_ERR;
 		error1( "malloc error in fzk\n");
 		fzk_discard(fzk_tbl);
 		return(NULL);
 	}
 	if ((fzk_tbl->kango_vect_area =
-	    (struct kangovect *) malloc(sizeof (struct kangovect) * (kango_vect_kosuu + SV_KOSUU))) == NULL) {
+	    (struct kangovect *) malloc0(sizeof (struct kangovect) * (kango_vect_kosuu + SV_KOSUU))) == NULL) {
 		wnn_errorno = WNN_MALLOC_ERR;
 		error1( "malloc error in fzk\n");
 		fzk_discard(fzk_tbl);
@@ -233,7 +233,7 @@
 
 #ifndef	NO_FZK
 	if ((fzk_tbl->tablefuzokugo =
-	    (struct fzkentry *) malloc(sizeof (struct fzkentry) * fzk_tbl->fzklength)) == NULL) {
+	    (struct fzkentry *) malloc0(sizeof (struct fzkentry) * fzk_tbl->fzklength)) == NULL) {
 		wnn_errorno = WNN_MALLOC_ERR;
 		error1( "malloc error in fzk\n");
 		fzk_discard(fzk_tbl);
@@ -341,16 +341,16 @@
 struct	FT	*fzk_tbl;
 {
 	if (fzk_tbl->kango_hinsi_area != NULL)
-		free(fzk_tbl->kango_hinsi_area);
+		free0(fzk_tbl->kango_hinsi_area);
 	if (fzk_tbl->kango_vect_area != NULL)
-		free(fzk_tbl->kango_vect_area);
+		free0(fzk_tbl->kango_vect_area);
 #ifndef NO_FZK
 	if (fzk_tbl->vect_area != NULL)
-		free(fzk_tbl->vect_area);
+		free0(fzk_tbl->vect_area);
 	if (fzk_tbl->tablefuzokugo != NULL)
-		free(fzk_tbl->tablefuzokugo);
+		free0(fzk_tbl->tablefuzokugo);
 #endif
-	free(fzk_tbl);
+	free0(fzk_tbl);
 }
 
 #ifndef NO_FZK
@@ -601,7 +601,7 @@
 	    key[yomicnt++] = *start++)
 		;
 	key[yomicnt] = 0;
-	for (; yomicnt > 0; key[--yomicnt] = NULL) {
+	for (; yomicnt > 0; key[--yomicnt] =(w_char) NULL) {
 		search_ptr = (struct fzkentry *) bsrch(key);
 		if (search_ptr != NULL) {
 			setno = setfzk(search_ptr, &ansptr, vector, fzkvect_l);
diff -ru /wk-wnn-test/base-src/Xsi/Wnn/jserver/get_kaiarea.c /wk-wnn-test/fixed-src/Xsi/Wnn/jserver/get_kaiarea.c
--- /wk-wnn-test/base-src/Xsi/Wnn/jserver/get_kaiarea.c	Fri Aug 19 10:31:24 1994
+++ /wk-wnn-test/fixed-src/Xsi/Wnn/jserver/get_kaiarea.c	Wed Jul  8 20:46:08 1998
@@ -70,7 +70,7 @@
 	int bun_len = ((kana_len + 1) * sizeof(w_char) + 7) & 0xfffffff8;
 
 	if((area_pter = 
-		malloc(bun_len + jmtw_len + jmt_len + jmtp_len + maxj_len)) == NULL){
+		malloc0(bun_len + jmtw_len + jmt_len + jmtp_len + maxj_len)) == NULL){
 		wnn_errorno = WNN_MALLOC_INITIALIZE;
 		error1("malloc in get_kaiseki_area");
 		return(-1);
@@ -101,7 +101,7 @@
 
 	maxchg = kana_len;
 	initjmt = maxchg - 1;
-	bun[maxchg] = NULL;
+	bun[maxchg] =(w_char) NULL;
 
 	return(0);
 }
diff -ru /wk-wnn-test/base-src/Xsi/Wnn/jserver/hinsi_list.c /wk-wnn-test/fixed-src/Xsi/Wnn/jserver/hinsi_list.c
--- /wk-wnn-test/base-src/Xsi/Wnn/jserver/hinsi_list.c	Wed Oct 28 13:02:20 1992
+++ /wk-wnn-test/fixed-src/Xsi/Wnn/jserver/hinsi_list.c	Wed Jul  8 03:36:25 1998
@@ -68,13 +68,13 @@
     w_char *j, *d, *start;
 
     if (jtl->maxhinsi_list == 0){
-	jtl->node = (struct wnn_hinsi_node *)malloc(0);
+	jtl->node = (struct wnn_hinsi_node *)malloc0(0);
 	jtl->maxnode = 0;
 	return;
     }
     jtl->maxnode = Strtime(jtl->hinsi_list, jtl->maxhinsi_list, NODE_CHAR);
     jtl->node = (struct wnn_hinsi_node *)
-	malloc(jtl->maxnode * sizeof(struct wnn_hinsi_node) + 
+	malloc0(jtl->maxnode * sizeof(struct wnn_hinsi_node) + 
 	jtl->maxhinsi_list * sizeof(w_char));
     d = (w_char *)(jtl->node + jtl->maxnode);
     if(jtl->hinsi_list == NULL) return;
@@ -182,12 +182,12 @@
     int len;
     */
 
-    free(jtl->node);
-    free(jtl->hinsi_list);
+    free0(jtl->node);
+    free0(jtl->hinsi_list);
 
     jtl->maxhinsi_list = Strlen(table);
     
-    jtl->hinsi_list = (w_char *)malloc(jtl->maxhinsi_list * sizeof(w_char));
+    jtl->hinsi_list = (w_char *)malloc0(jtl->maxhinsi_list * sizeof(w_char));
     Strcpy(jtl->hinsi_list, table);
     make_hinsi_list(jtl);
     jtl->dirty = 1;
diff -ru /wk-wnn-test/base-src/Xsi/Wnn/jserver/initjserv.c /wk-wnn-test/fixed-src/Xsi/Wnn/jserver/initjserv.c
--- /wk-wnn-test/base-src/Xsi/Wnn/jserver/initjserv.c	Fri Aug 19 10:31:25 1994
+++ /wk-wnn-test/fixed-src/Xsi/Wnn/jserver/initjserv.c	Wed Jul  8 21:25:40 1998
@@ -242,7 +242,7 @@
     int i = 0;
     struct cnv_env *ne;
 
-    if((ne= (struct cnv_env *)malloc(sizeof(struct cnv_env)))==0) return -1;
+    if((ne= (struct cnv_env *)malloc0(sizeof(struct cnv_env)))==0) return -1;
     env[i]=ne; new_env(i,"dummy_env");
 }
 */
@@ -288,7 +288,7 @@
 
     total = 0;
     flag = 0;
-    while(*st != NULL){
+    while(*st !=(char) NULL){
 	if (isdigit(*st)){
 	    total = total * 10 + (*st - '0');
 	} else if (*st == '+') {
diff -ru /wk-wnn-test/base-src/Xsi/Wnn/jserver/jikouho_d.c /wk-wnn-test/fixed-src/Xsi/Wnn/jserver/jikouho_d.c
--- /wk-wnn-test/base-src/Xsi/Wnn/jserver/jikouho_d.c	Tue Jun 28 11:06:57 1994
+++ /wk-wnn-test/fixed-src/Xsi/Wnn/jserver/jikouho_d.c	Wed Jul  8 03:39:39 1998
@@ -561,8 +561,8 @@
     if (md_cnt < cnt) {
 	/* どんどんふくれる Jserver */
 	if (m_dbn)
-	    free(m_dbn);
-	m_dbn = (struct DSD_DBN *) malloc(cnt * sizeof(struct DSD_DBN));
+	    free0(m_dbn);
+	m_dbn = (struct DSD_DBN *) malloc0(cnt * sizeof(struct DSD_DBN));
 	if (m_dbn == NULL) {
 	    /* 大きくなって天まで届け! */
 		wnn_errorno = WNN_JKTAREA_FULL;
@@ -584,8 +584,8 @@
 
     if (ms_cnt < cnt) {
 	if (m_sbn)
-	    free(m_sbn);
-	m_sbn = (struct DSD_SBN *) malloc(cnt * sizeof(struct DSD_SBN));
+	    free0(m_sbn);
+	m_sbn = (struct DSD_SBN *) malloc0(cnt * sizeof(struct DSD_SBN));
 	if (m_sbn == NULL) {
 	    wnn_errorno = WNN_JKTAREA_FULL;
 	    error1("malloc err in dbn_set (at daibnsetsu jikouho).\n");
diff -ru /wk-wnn-test/base-src/Xsi/Wnn/jserver/jishoop.c /wk-wnn-test/fixed-src/Xsi/Wnn/jserver/jishoop.c
--- /wk-wnn-test/base-src/Xsi/Wnn/jserver/jishoop.c	Tue Sep 22 13:49:43 1992
+++ /wk-wnn-test/fixed-src/Xsi/Wnn/jserver/jishoop.c	Wed Jul  8 15:35:38 1998
@@ -102,7 +102,7 @@
 	return(-1);
     }
 
-    if (wnn_get_hinsi_name(hinsi) == NULL) {
+    if (wnn_get_hinsi_name(hinsi) ==(int) NULL) {
 	return(-1);
     }
     if(jtl->syurui == WNN_UD_DICT){
@@ -467,7 +467,7 @@
  found_it:
     if(p->kosuu == 1){
 	*next_pter = p->next;
-	if(tary[ind1].pter == NULL)
+	if(tary[ind1].pter ==(int) NULL)
 	    remove_space(tary, ind1, jtl, tary[ind1].pter1);
 	if(p->serial == jtl->maxserial - 1){
 	    jtl->maxserial--;
diff -ru /wk-wnn-test/base-src/Xsi/Wnn/jserver/malloc.c /wk-wnn-test/fixed-src/Xsi/Wnn/jserver/malloc.c
--- /wk-wnn-test/base-src/Xsi/Wnn/jserver/malloc.c	Fri Aug 19 10:31:26 1994
+++ /wk-wnn-test/fixed-src/Xsi/Wnn/jserver/malloc.c	Thu Jul  9 17:27:05 1998
@@ -63,10 +63,13 @@
 malloc0(size)
 int size;
 {
-    if(size == NULL){
+    if(size ==(int) NULL){
 	size = 1;
     }
-    size = (size + 7) & 0xfffffff8;
+/*    size = (size + 7) & 0xfffffff8;*/
+	size=size >> 3;
+	size=size+1;
+	size=size << 3;
     return(calloc(size,1));
 }
 
@@ -84,11 +87,15 @@
 char *pter;
 int size;
 {
-    if(size == NULL){
+    if(size ==(int) NULL){
 	size = 1;
     }
-    size = (size + 7) & 0xfffffff8;
+/*    size = (size + 7) & 0xfffffff8;*/
+	size=size >> 3;
+	size=size + 1;
+	size=size << 3;
+
     if(pter == NULL)
-	return(malloc(size));
+	return(malloc0(size));
     return(realloc(pter,size));
 }
diff -ru /wk-wnn-test/base-src/Xsi/Wnn/jserver/mknode1.c /wk-wnn-test/fixed-src/Xsi/Wnn/jserver/mknode1.c
--- /wk-wnn-test/base-src/Xsi/Wnn/jserver/mknode1.c	Wed Sep  1 15:37:43 1993
+++ /wk-wnn-test/fixed-src/Xsi/Wnn/jserver/mknode1.c	Wed Jul  8 03:43:12 1998
@@ -80,7 +80,7 @@
 	register struct free_list *area;
 
 	if ((area = (struct free_list *)
-	    malloc(size * kosuu  + sizeof(struct free_list))
+	    malloc0(size * kosuu  + sizeof(struct free_list))
 	    ) == NULL) {
 		wnn_errorno = WNN_MALLOC_INITIALIZE;
 		error1("Cannot Malloc in get_area.\n");
@@ -99,7 +99,7 @@
 	if (list == 0)
 		return;
 	free_area(list->lnk);
-	free(list);
+	free0(list);
 }
 
 /* free_sbn が 0 でない時に呼んだらあかんよ */
diff -ru /wk-wnn-test/base-src/Xsi/Wnn/jserver/readfile.c /wk-wnn-test/fixed-src/Xsi/Wnn/jserver/readfile.c
--- /wk-wnn-test/base-src/Xsi/Wnn/jserver/readfile.c	Fri Sep 25 07:35:47 1992
+++ /wk-wnn-test/fixed-src/Xsi/Wnn/jserver/readfile.c	Thu Jul  9 02:18:06 1998
@@ -94,7 +94,7 @@
     FILE *fp;
     struct wnn_file_head fh;
     if(wf->localf == REMOTE){
-	if(fopen_read_cur(wf->name) == NULL){
+	if(fopen_read_cur(wf->name) == 0){
 	    wnn_errorno = WNN_FILE_READ_ERROR;
 	    error1( "read_file:No file %s.\n", wf->name);
 	    return(-1);
@@ -151,11 +151,11 @@
     struct JT *jt1;
     long x;
 
-    jt1 = (struct JT *)malloc(sizeof(struct JT));
+    jt1 = (struct JT *)malloc0(sizeof(struct JT));
     jt1->node = 0;
     if(input_header_jt(fp, jt1) == -1){
 	wnn_errorno = WNN_NOT_A_FILE;
-	free(jt1);
+	free0(jt1);
 	return(NULL);
     }    
     if(jt1->syurui == WNN_UD_DICT){
@@ -186,11 +186,11 @@
     }else{
 	wnn_errorno = WNN_NOT_A_DICT;
 	error1("Not a correct jisho\n");
-	free(jt1);
+	free0(jt1);
 	return(NULL);
     }    
     if(alloc_dict(jt1) == -1){
-	free(jt1);
+	free0(jt1);
 	return(NULL);
     }
     if(vfread(jt1->comment ,2,jt1->maxcomment,fp) !=jt1->maxcomment){
@@ -292,7 +292,7 @@
 struct JT *jt1;
 {
     error1( "Hontai Realloc occured\n");
-    if((jt1->hontai = (UCHAR *)realloc((char *)jt1->hontai , 
+    if((jt1->hontai = (UCHAR *)realloc0((char *)jt1->hontai , 
 			      (jt1->bufsize_hontai =
 			       jt1->maxhontai + MAXHONTAI))) == NULL){
 	wnn_errorno = WNN_MALLOC_ERR;
@@ -307,7 +307,7 @@
 struct JT *jt1;
 {
     error1( "Kanji Realloc occured\n");
-    if((jt1->kanji = (UCHAR *)realloc((char *)jt1->kanji , 
+    if((jt1->kanji = (UCHAR *)realloc0((char *)jt1->kanji , 
 			     (jt1->bufsize_kanji =
 			      jt1->maxkanji + MAXKANJI))) == NULL){
 	wnn_errorno = WNN_MALLOC_ERR;
@@ -322,13 +322,13 @@
 struct JT *jt1;
 {
     error1( "Serial Realloc occured\n");
-    if((jt1->hindo = (UCHAR *)realloc((char *)jt1->hindo , 
+    if((jt1->hindo = (UCHAR *)realloc0((char *)jt1->hindo , 
 	    (jt1->bufsize_serial =
 	     jt1->maxserial + MAXSERIAL) * sizeof(*jt1->hindo))) == NULL ||
-       (jt1->hinsi = (unsigned short *)realloc((char *)jt1->hinsi,
+       (jt1->hinsi = (unsigned short *)realloc0((char *)jt1->hinsi,
 	    (jt1->maxserial + MAXSERIAL) * sizeof(*jt1->hinsi))) == NULL
 #ifdef	CONVERT_with_SiSheng
-        || (jt1->sisheng = (unsigned short *)realloc((char *)jt1->sisheng,
+        || (jt1->sisheng = (unsigned short *)realloc0((char *)jt1->sisheng,
 	    (jt1->maxserial + MAXSERIAL) * sizeof(*jt1->sisheng))) == NULL
 #endif	/* CONVERT_with_SiSheng */
 		){
@@ -341,7 +341,7 @@
 #else
     if(jt1->syurui == WNN_REV_DICT){
 #endif	/* CONVERT_by_STROKE || CONVERT_with_SiSheng */
-	if((jt1->ri2 = (struct rind2 *)realloc((char *)jt1->ri2 , 
+	if((jt1->ri2 = (struct rind2 *)realloc0((char *)jt1->ri2 , 
 	       (jt1->maxserial + MAXSERIAL) * sizeof(struct rind2))) == NULL){
 	    wnn_errorno = WNN_MALLOC_ERR;
 	    error1("Can't make the jisho area bigger");
@@ -356,7 +356,7 @@
 struct JT *jt1;
 {
     error1( "Table Realloc occured\n");
-    if((jt1->table = (struct uind1 *)realloc((char *)jt1->table,
+    if((jt1->table = (struct uind1 *)realloc0((char *)jt1->table,
 	       (jt1->bufsize_table =
 		jt1->maxtable + MAXTABLE) * sizeof(struct uind1))) == NULL){
 	wnn_errorno = WNN_MALLOC_ERR;
@@ -372,7 +372,7 @@
 int which;
 {
     error1( "ri1 Realloc occured\n");
-    if((jt1->ri1[which] = (struct rind1 *)realloc((char *)jt1->ri1[which],
+    if((jt1->ri1[which] = (struct rind1 *)realloc0((char *)jt1->ri1[which],
 	       (jt1->bufsize_ri1[which] =
 		jt1->maxri1[which] + MAXTABLE) * sizeof(struct rind1))) == NULL){
 	wnn_errorno = WNN_MALLOC_ERR;
@@ -388,7 +388,7 @@
 struct HJT *hjt1;
 {
     error1( "Hindo file Realloc Occured\n");
-    if((hjt1->hindo = (UCHAR *)realloc((char *)hjt1->hindo , 
+    if((hjt1->hindo = (UCHAR *)realloc0((char *)hjt1->hindo , 
 	    (hjt1->bufsize_serial =
 	     hjt1->maxserial + MAXSERIAL) * sizeof(*hjt1->hindo))) == NULL){
 	wnn_errorno = WNN_MALLOC_ERR;
@@ -403,7 +403,7 @@
 rd_realloc_bind(jt)
 struct JT *jt;
 {
-    jt->bind = (struct b_node * ) realloc( (char *)jt->bind,
+    jt->bind = (struct b_node * ) realloc0( (char *)jt->bind,
 		    (jt->bufsize_bnode+MAXBIND) * sizeof(struct b_node) );
     if (jt->bind == NULL) {
 	wnn_errorno = WNN_MALLOC_ERR;
@@ -421,11 +421,11 @@
 {
 struct JT *jt2;
 
-    jt2 = (struct JT *)malloc(sizeof(struct JT));
+    jt2 = (struct JT *)malloc0(sizeof(struct JT));
     *jt2 = *jt1;
 
     if(alloc_dict(jt2) == -1){
-	free(jt2);
+	free0(jt2);
 	return(NULL);
     }
     bcopy(jt1->hindo, jt2->hindo, jt1->maxserial);
@@ -509,7 +509,7 @@
 /*    if(wf->localf == REMOTE){
       }
 */
-    if(fopen_write_cur(wf->name) == NULL){
+    if(fopen_write_cur(wf->name) == 0){
 	error1( "receive_file:No file %s.\n", wf->name);
 	wnn_errorno=WNN_FILE_WRITE_ERROR;
 	return(-1);
@@ -738,21 +738,21 @@
 struct JT *jt;
 {
     if(jt) {
-	free(jt->hindo);
-	free(jt->hinsi);
+	free0(jt->hindo);
+	free0(jt->hinsi);
 #ifdef	CONVERT_with_SiSheng
-	free(jt->sisheng);
+	free0(jt->sisheng);
 #endif	/* CONVERT_with_SiSheng */
-	free(jt->kanji);
-	free(jt->table);
-	free(jt->hontai);
-	free(jt->comment);
-	free(jt->hinsi_list);
-	free(jt->ri1[D_YOMI]);
-	free(jt->ri1[D_KANJI]);
-	free(jt->ri2);
-	free(jt->node);
-	free(jt);
+	free0(jt->kanji);
+	free0(jt->table);
+	free0(jt->hontai);
+	free0(jt->comment);
+	free0(jt->hinsi_list);
+	free0(jt->ri1[D_YOMI]);
+	free0(jt->ri1[D_KANJI]);
+	free0(jt->ri2);
+	free0(jt->node);
+	free0(jt);
     }
     return(0);
 }
@@ -765,10 +765,10 @@
 {
     struct HJT *hjt1;
     
-    hjt1 = (struct HJT *)malloc(sizeof(struct HJT));
+    hjt1 = (struct HJT *)malloc0(sizeof(struct HJT));
     if(input_header_hjt(fp, hjt1) == -1){
 	wnn_errorno= WNN_NOT_A_FILE;
-	free(hjt1);
+	free0(hjt1);
 	return(NULL);
     }
     
@@ -776,12 +776,12 @@
 
     hjt1->hindo = (UCHAR *)NULL;
     hjt1->comment = (w_char *)NULL;
-    if((hjt1->hindo =  (UCHAR *)malloc(hjt1->bufsize_serial)) == NULL ||
-       (hjt1->comment = (w_char *)malloc(hjt1->maxcomment * sizeof(w_char))) == NULL ){
+    if((hjt1->hindo =  (UCHAR *)malloc0(hjt1->bufsize_serial)) == NULL ||
+       (hjt1->comment = (w_char *)malloc0(hjt1->maxcomment * sizeof(w_char))) == NULL ){
 	wnn_errorno = WNN_MALLOC_ERR;
-	free(hjt1->hindo);
-	free(hjt1->comment);
-	free(hjt1);
+	free0(hjt1->hindo);
+	free0(hjt1->comment);
+	free0(hjt1);
 	error1("Can't alloc hindo area\n");
 	return(NULL);
     }
@@ -824,9 +824,9 @@
 struct HJT *hjt;
 {
     if(hjt) {
-	free(hjt->hindo);
-	free(hjt->comment);
-	free(hjt);
+	free0(hjt->hindo);
+	free0(hjt->comment);
+	free0(hjt);
     }
     return(0);
 }
@@ -873,33 +873,33 @@
     jt1->ri1[D_YOMI] = (struct rind1 *)NULL;
     jt1->ri1[D_KANJI] = (struct rind1 *)NULL;
     jt1->ri2 = (struct rind2 *)NULL;
-    if(((jt1->hindo = (UCHAR *)malloc(jt1->bufsize_serial)) == NULL) ||
-       ((jt1->hinsi = (unsigned short *)(malloc(jt1->bufsize_serial * sizeof(short)))) == NULL) ||
+    if(((jt1->hindo = (UCHAR *)malloc0(jt1->bufsize_serial)) == NULL) ||
+       ((jt1->hinsi = (unsigned short *)(malloc0(jt1->bufsize_serial * sizeof(short)))) == NULL) ||
 #ifdef	CONVERT_with_SiSheng
-       ((jt1->sisheng = (unsigned short *)(malloc(jt1->bufsize_serial * sizeof(short)))) == NULL) ||
+       ((jt1->sisheng = (unsigned short *)(malloc0(jt1->bufsize_serial * sizeof(short)))) == NULL) ||
 #endif	/* CONVERT_with_SiSheng */
-       ((jt1->kanji = (UCHAR *)malloc(jt1->bufsize_kanji)) == NULL) ||
-       ((jt1->table = (struct uind1 *)malloc( jt1->bufsize_table * sizeof(struct uind1))) == NULL) ||
-       ((jt1->hontai = (UCHAR *)malloc( jt1->bufsize_hontai)) == NULL) ||
-       ((jt1->comment = (w_char *)malloc(jt1->maxcomment * sizeof(w_char))) == NULL) ||
-       ((jt1->hinsi_list = (w_char *)malloc(jt1->maxhinsi_list * sizeof(w_char))) == NULL) ||
-       ((jt1->ri1[D_YOMI] = (struct rind1 *)malloc(jt1->bufsize_ri1[D_YOMI] * sizeof(struct rind1))) == NULL) ||
-       ((jt1->ri1[D_KANJI] = (struct rind1 *)malloc(jt1->bufsize_ri1[D_KANJI] * sizeof(struct rind1))) == NULL) ||
-       ((jt1->ri2 = (struct rind2 *)malloc(jt1->bufsize_serial * sizeof(struct rind2))) == NULL)){
+       ((jt1->kanji = (UCHAR *)malloc0(jt1->bufsize_kanji)) == NULL) ||
+       ((jt1->table = (struct uind1 *)malloc0( jt1->bufsize_table * sizeof(struct uind1))) == NULL) ||
+       ((jt1->hontai = (UCHAR *)malloc0( jt1->bufsize_hontai)) == NULL) ||
+       ((jt1->comment = (w_char *)malloc0(jt1->maxcomment * sizeof(w_char))) == NULL) ||
+       ((jt1->hinsi_list = (w_char *)malloc0(jt1->maxhinsi_list * sizeof(w_char))) == NULL) ||
+       ((jt1->ri1[D_YOMI] = (struct rind1 *)malloc0(jt1->bufsize_ri1[D_YOMI] * sizeof(struct rind1))) == NULL) ||
+       ((jt1->ri1[D_KANJI] = (struct rind1 *)malloc0(jt1->bufsize_ri1[D_KANJI] * sizeof(struct rind1))) == NULL) ||
+       ((jt1->ri2 = (struct rind2 *)malloc0(jt1->bufsize_serial * sizeof(struct rind2))) == NULL)){
 	wnn_errorno = WNN_MALLOC_ERR;
-	free(jt1->hindo);
-	free(jt1->hinsi);
+	free0(jt1->hindo);
+	free0(jt1->hinsi);
 #ifdef	CONVERT_with_SiSheng
-	free(jt1->sisheng);
+	free0(jt1->sisheng);
 #endif	/* CONVERT_with_SiSheng */
-	free(jt1->kanji);
-	free(jt1->table);
-	free(jt1->hontai);
-	free(jt1->comment);
-	free(jt1->hinsi_list);
-	free(jt1->ri1[D_YOMI]);
-	free(jt1->ri1[D_KANJI]);
-	free(jt1->ri2);
+	free0(jt1->kanji);
+	free0(jt1->table);
+	free0(jt1->hontai);
+	free0(jt1->comment);
+	free0(jt1->hinsi_list);
+	free0(jt1->ri1[D_YOMI]);
+	free0(jt1->ri1[D_KANJI]);
+	free0(jt1->ri2);
 	error1("Can't alloc jisho area\n");
 	return(-1);
     }
@@ -918,14 +918,14 @@
     case  WNN_FT_DICT_FILE:
 	jt = (struct JT *)wf->area;
 	jt->maxcomment = Strlen(com) + 1;
-	jt->comment = (w_char *) realloc((char *)jt->comment, jt->maxcomment * sizeof(w_char));
+	jt->comment = (w_char *) realloc0((char *)jt->comment, jt->maxcomment * sizeof(w_char));
 	Strcpy(jt->comment, com);
 	jt->dirty = 1;
 	break;
     case WNN_FT_HINDO_FILE:
 	hjt = (struct HJT *)wf->area;
 	hjt->maxcomment = Strlen(com) + 1;
-	hjt->comment = (w_char *) realloc((char *)hjt->comment, hjt->maxcomment * sizeof(w_char));
+	hjt->comment = (w_char *) realloc0((char *)hjt->comment, hjt->maxcomment * sizeof(w_char));
 	Strcpy(hjt->comment, com);
 	hjt->hdirty = 1;
 	break;
diff -ru /wk-wnn-test/base-src/Xsi/Wnn/jutil/atod.c /wk-wnn-test/fixed-src/Xsi/Wnn/jutil/atod.c
--- /wk-wnn-test/base-src/Xsi/Wnn/jutil/atod.c	Tue Jun 28 11:07:27 1994
+++ /wk-wnn-test/fixed-src/Xsi/Wnn/jutil/atod.c	Thu Jul  9 07:36:38 1998
@@ -56,6 +56,8 @@
 #include <ctype.h>
 #include "commonhd.h"
 #include "config.h"
+
+#include "wnn_malloc.h"
 #include "jslib.h"
 #include "jh.h"
 #include "jdata.h"
@@ -113,7 +115,7 @@
 int tnum = 0;
 struct uind2 *uhopter;
 
-char *malloc();
+char *malloc0();
 char *hinsi_file_name = NULL;
 
 
@@ -195,16 +197,16 @@
 alloc_area()
 {
   if(which_dict == WNN_STATIC_DICT){
-      if((hostart = (UCHAR *)malloc(maxserial * HONTAI_PER_ENTRY)) == NULL){
+      if((hostart = (UCHAR *)malloc0(maxserial * HONTAI_PER_ENTRY)) == NULL){
 	  fprintf(stderr, "Malloc Failed\n");
 	  exit(1);
       }
       hopter = hostart;
       hoend = (UCHAR *)hostart + maxserial * HONTAI_PER_ENTRY;
   }else {
-      if((tary = (struct uind1 *)malloc(jt.maxserial * sizeof(struct uind1))) == NULL ||
+      if((tary = (struct uind1 *)malloc0(jt.maxserial * sizeof(struct uind1))) == NULL ||
                                 /* Too large? */
-	 (hostart =(UCHAR *)malloc(jt.maxserial *
+	 (hostart =(UCHAR *)malloc0(jt.maxserial *
 		      (sizeof(struct uind2) + sizeof(w_char) * 2))) == NULL){
                                 /* 2 must be enough? */
 	  fprintf(stderr, "Malloc Failed\n");
@@ -219,8 +221,7 @@
 extern int sort_func_je();
 FILE *ofpter , *fopen();
 
-void
-main(argc,argv)
+int main(argc,argv)
      int argc ;
      char **argv;
 {
@@ -255,7 +256,7 @@
   if((ofpter = fopen(outfile , "w")) == NULL){
       fprintf(stderr , "Can't open the output file %s.\n" , outfile);
       perror("");
-      exit(1);
+      return (1);
   }
 
 #ifdef CHINESE
@@ -286,7 +287,7 @@
   output_comment(ofpter);	/* In order to change the byte order */
   output_hinsi_list(ofpter);	/* In order to change the byte order */	
 #endif
-  exit (0);
+  return (0);
 }
 
 
@@ -711,7 +712,7 @@
 
 /*
     fprintf(stderr, "Realloc.\n");
-    if((hostart = (char *)realloc(hostart, size)) == NULL){
+    if((hostart = (char *)realloc0(hostart, size)) == NULL){
 	fprintf(stderr, "Ralloc Failed\n");
 	exit(1);
     }
@@ -817,3 +818,5 @@
     }
 } 
 #endif 	/* CONVERT_with_SiSheng */
+
+#include "../jserver/malloc.c"
\ No newline at end of file
diff -ru /wk-wnn-test/base-src/Xsi/Wnn/jutil/atof.c /wk-wnn-test/fixed-src/Xsi/Wnn/jutil/atof.c
--- /wk-wnn-test/base-src/Xsi/Wnn/jutil/atof.c	Tue Jun 28 11:07:28 1994
+++ /wk-wnn-test/fixed-src/Xsi/Wnn/jutil/atof.c	Thu Jul  9 07:37:46 1998
@@ -297,8 +297,7 @@
   exit(1);
 }
 
-void
-main(argc, argv)
+int main(argc, argv)
 int argc;
 char **argv;
 {
@@ -320,7 +319,7 @@
   check_fuzokugo();
 #endif	/* NO_FZK */
   print_out();
-  exit(0);
+  return (0);
 } 
 
 
diff -ru /wk-wnn-test/base-src/Xsi/Wnn/jutil/atorev.c /wk-wnn-test/fixed-src/Xsi/Wnn/jutil/atorev.c
--- /wk-wnn-test/base-src/Xsi/Wnn/jutil/atorev.c	Tue Sep 22 13:53:02 1992
+++ /wk-wnn-test/fixed-src/Xsi/Wnn/jutil/atorev.c	Wed Jul  8 08:28:26 1998
@@ -55,6 +55,8 @@
 #include <stdio.h>
 #include <ctype.h>
 #include "commonhd.h"
+
+#include "wnn_malloc.h"
 #include "jslib.h"
 #include "jh.h"
 #include "jdata.h"
@@ -88,10 +90,10 @@
 static void
 r_alloc()
 {
-    if((jt.ri2 = (struct rind2 *)malloc((jt.maxserial) * sizeof(struct rind2))) == NULL ||
-       (jt.ri1[D_YOMI] = (struct rind1 *)malloc(jt.maxserial * sizeof(struct rind1))) == NULL ||
-       (jt.ri1[D_KANJI] = (struct rind1 *)malloc(jt.maxserial * sizeof(struct rind1))) == NULL ||
-       (ptmp = (struct je **)malloc(jt.maxserial * sizeof(struct je *))) == NULL){
+    if((jt.ri2 = (struct rind2 *)malloc0((jt.maxserial) * sizeof(struct rind2))) == NULL ||
+       (jt.ri1[D_YOMI] = (struct rind1 *)malloc0(jt.maxserial * sizeof(struct rind1))) == NULL ||
+       (jt.ri1[D_KANJI] = (struct rind1 *)malloc0(jt.maxserial * sizeof(struct rind1))) == NULL ||
+       (ptmp = (struct je **)malloc0(jt.maxserial * sizeof(struct je *))) == NULL){
 	fprintf(stderr, "Malloc Failed\n");
 	  exit(1);
       }
diff -ru /wk-wnn-test/base-src/Xsi/Wnn/jutil/dtoa.c /wk-wnn-test/fixed-src/Xsi/Wnn/jutil/dtoa.c
--- /wk-wnn-test/base-src/Xsi/Wnn/jutil/dtoa.c	Tue Jun 28 11:07:30 1994
+++ /wk-wnn-test/fixed-src/Xsi/Wnn/jutil/dtoa.c	Thu Jul  9 06:20:48 1998
@@ -55,6 +55,8 @@
 #include <stdio.h>
 #include "commonhd.h"
 #include "config.h"
+
+#include "wnn_malloc.h"
 #include "jslib.h"
 #include "jh.h"
 #include "jdata.h"
@@ -89,8 +91,7 @@
 
 char *hinsi_file_name = NULL;
 
-void
-main(argc, argv)
+int main(argc, argv)
 int argc;
 char **argv;
 {
@@ -108,9 +109,9 @@
     if((ifpter = fopen(infile , "r")) == NULL){
 	fprintf(stderr , "Can't open the input file %s.\n" , infile);
 	perror("");
-	exit(1);
+	return (1);
     }
-    if(input_header(ifpter, &jt, &file_head) == -1)exit(1);
+    if(input_header(ifpter, &jt, &file_head) == -1)return (1);
     which_dict = jt.syurui;
     input_comment(ifpter);
     input_hinsi_list(ifpter);
@@ -136,7 +137,7 @@
 	sort();
     }
     output_ujis(stdout, serial_out, esc_expand);
-    exit (0);
+    return  (0);
 }
 
 
@@ -214,13 +215,13 @@
     init_heap(0,			/* jt.maxkanji,*/
 	    jt.maxserial * YOMI_PER_LINE * 5, /* may be enough */
 	    jt.maxserial, jt.maxserial, stdin);
-    jt.table = (struct uind1 *)malloc(jt.maxtable * sizeof(struct uind1));
-    jt.hontai = (UCHAR *)malloc(jt.maxhontai);
-    jt.ri1[D_YOMI] = (struct rind1 *)malloc(jt.maxri1[D_YOMI] * sizeof(struct rind1));
-    jt.ri1[D_KANJI] = (struct rind1 *)malloc(jt.maxri1[D_KANJI] * sizeof(struct rind1));
-    jt.kanji = (UCHAR *)malloc(jt.maxkanji + 1);
-    jt.ri2 = (struct rind2 *)malloc(jt.maxserial * sizeof(struct rind2));
-    jt.hinsi = (w_char *)malloc(jt.maxserial * sizeof(w_char));
+    jt.table = (struct uind1 *)malloc0(jt.maxtable * sizeof(struct uind1));
+    jt.hontai = (UCHAR *)malloc0(jt.maxhontai);
+    jt.ri1[D_YOMI] = (struct rind1 *)malloc0(jt.maxri1[D_YOMI] * sizeof(struct rind1));
+    jt.ri1[D_KANJI] = (struct rind1 *)malloc0(jt.maxri1[D_KANJI] * sizeof(struct rind1));
+    jt.kanji = (UCHAR *)malloc0(jt.maxkanji + 1);
+    jt.ri2 = (struct rind2 *)malloc0(jt.maxserial * sizeof(struct rind2));
+    jt.hinsi = (w_char *)malloc0(jt.maxserial * sizeof(w_char));
     if(!jt.table || !jt.hontai || !jt.ri1[D_YOMI] || !jt.ri1[D_KANJI] || !jt.kanji || !jt.ri2 || !jt.hinsi){
 	fprintf(stderr, "Malloc Failed.\n");
 	exit(1);
@@ -528,3 +529,4 @@
 }
 
 #endif
+#include "../jserver/malloc.c"
\ No newline at end of file
diff -ru /wk-wnn-test/base-src/Xsi/Wnn/jutil/oldatonewa.c /wk-wnn-test/fixed-src/Xsi/Wnn/jutil/oldatonewa.c
--- /wk-wnn-test/base-src/Xsi/Wnn/jutil/oldatonewa.c	Tue Sep 22 13:53:09 1992
+++ /wk-wnn-test/fixed-src/Xsi/Wnn/jutil/oldatonewa.c	Thu Jul  9 05:52:14 1998
@@ -94,8 +94,7 @@
 static int get_line1();
 static char *get_string();
 
-void
-main()
+int main()
 {
   char buffer[LINE_SIZE];
 
@@ -104,7 +103,7 @@
   for(;fgets(buffer, LINE_SIZE, stdin) != NULL;){
     get_line1(buffer);
   }
-  exit (0);
+  return (0);
 }
 
 static int
diff -ru /wk-wnn-test/base-src/Xsi/Wnn/jutil/ujisf.c /wk-wnn-test/fixed-src/Xsi/Wnn/jutil/ujisf.c
--- /wk-wnn-test/base-src/Xsi/Wnn/jutil/ujisf.c	Thu Jul  1 12:59:06 1993
+++ /wk-wnn-test/fixed-src/Xsi/Wnn/jutil/ujisf.c	Wed Jul  8 08:29:45 1998
@@ -56,6 +56,8 @@
 
 #include <stdio.h>
 #include "commonhd.h"
+
+#include "wnn_malloc.h"
 #include "jslib.h"
 #include "jh.h"
 #include "jdata.h"
@@ -202,7 +204,7 @@
     char *c1;
     
     if(jehp == jeheapend){
-	if((jehp = je_heap =  (struct je *)malloc((HEAPINC * sizeof(struct je)))) == NULL){
+	if((jehp = je_heap =  (struct je *)malloc0((HEAPINC * sizeof(struct je)))) == NULL){
 	    fprintf(stderr, "Malloc Failed\n");
 	    return(-1);
 	}
@@ -322,7 +324,7 @@
 {
     int len;
     if(hp + LENGTHKANJI >= heapend){
-	if((hp = heap = (UCHAR *)malloc((HEAPINC * HEAP_PER_LINE))) == NULL){
+	if((hp = heap = (UCHAR *)malloc0((HEAPINC * HEAP_PER_LINE))) == NULL){
 	    fprintf(stderr, "Malloc Failed\n");
 	    exit(1);
 	}
@@ -344,7 +346,7 @@
     register int len = wnn_Strlen(str);
     
     if(yhp + len + 1 >= yheapend){
-	if((yhp = yomi_heap = (w_char *)malloc((HEAPINC * sizeof(w_char)))) == NULL){
+	if((yhp = yomi_heap = (w_char *)malloc0((HEAPINC * sizeof(w_char)))) == NULL){
 	    fprintf(stderr, "Malloc Failed\n");
 	    return(-1);
 	}
@@ -559,9 +561,9 @@
 int hpb, yhpb, l, rl;
 FILE *ipf;
 {
-    jehp = je_heap =  (struct je *)malloc((rl * sizeof(struct je)));
-    hp = heap = (UCHAR *)malloc(hpb);
-    yhp = yomi_heap = (w_char *)malloc((yhpb * sizeof(w_char)));
+    jehp = je_heap =  (struct je *)malloc0((rl * sizeof(struct je)));
+    hp = heap = (UCHAR *)malloc0(hpb);
+    yhp = yomi_heap = (w_char *)malloc0((yhpb * sizeof(w_char)));
     if((jeary = (struct je **)calloc(l, sizeof(struct je *))) == NULL){
 	fprintf(stderr, "Malloc Failed\n");
 	return(-1);
@@ -586,8 +588,8 @@
 /* test  program
    main()
    {
-   yhp = yomi_heap = (w_char *)malloc(100000);
-   jeary = (struct je *)malloc(100000);
+   yhp = yomi_heap = (w_char *)malloc0(100000);
+   jeary = (struct je *)malloc0(100000);
    
    ifpter = stdin;
    ujis_header();
diff -ru /wk-wnn-test/base-src/Xsi/Wnn/jutil/wddel.c /wk-wnn-test/fixed-src/Xsi/Wnn/jutil/wddel.c
--- /wk-wnn-test/base-src/Xsi/Wnn/jutil/wddel.c	Mon Nov 30 16:35:07 1992
+++ /wk-wnn-test/fixed-src/Xsi/Wnn/jutil/wddel.c	Thu Jul  9 10:24:18 1998
@@ -55,6 +55,8 @@
 #include <stdio.h>
 #include "commonhd.h"
 #include "config.h"
+
+#include "wnn_malloc.h"
 #include "jllib.h"
 #include "jslib.h"
 #include "wnn_string.h"
@@ -97,8 +99,7 @@
     exit(1);
 }
 
-void
-main(argc, argv)
+int main(argc, argv)
 int argc;
 char **argv;
 {
@@ -164,7 +165,7 @@
     if(!fname && dic_no == -1)usage();
 
 
-    rb.buf = (char *)malloc((unsigned)(rb.size = 0));
+    rb.buf = (char *)malloc0((unsigned)(rb.size = 0));
 
     if((js = js_open(server_n, WNN_TIMEOUT)) == NULL) err();
     if((env=js_connect(js, env_n)) == NULL) err(); 
@@ -190,18 +191,21 @@
 	*/
 	fprintf(stderr,
 	"The specified dictionary isn't exist in current environment\n");
-	exit(1);
+	return (1);
     }
     if(info[k].type != WNN_UD_DICT && info[k].type != WNN_REV_DICT){
 	/*
 	fprintf(stderr, "指定された番号の辞書は、登録可能ではありません。\n");
 	*/
 	fprintf(stderr, "The specified dictionary isn't registable\n");
-	exit(1);
+	return (1);
     }
-    while(gets(s)){
-	char com[LENGTHYOMI];
-	char Com[LENGTHYOMI];
+    while( gets(s) ){
+
+	char ComL[LENGTHYOMI];
+	char coms[LENGTHYOMI ];
+
+
 	int ima, hindo;
 	if(s[0] == '\\') continue;
 	switch(what){
@@ -216,12 +220,12 @@
 	    }
 	    break;
 	case COMMENT_SET:
-	    if(sscanf(s, "%d %s",&sno, com) <= 1){
+	    if(sscanf(s, "%d %s",&sno, coms) <= 1){
 		fprintf(stderr, "Bad line \"%s\"", s);
 		continue;
 	    }
-	    wnn_Sstrcpy(Com, com);
-	    if(js_word_comment_set(env, dic_no, sno, Com) == -1){
+	    wnn_Sstrcpy(ComL , coms);
+	    if(js_word_comment_set(env, dic_no, sno, ComL) == -1){
 		fprintf(stderr, "serial-no = %d\n", sno);
 		err();
 	    }
@@ -246,5 +250,5 @@
 	}
 	fprintf(stderr, "Wrote the file back.\n");
     }
-    exit(0);
+    return (0);
 }
diff -ru /wk-wnn-test/base-src/Xsi/Wnn/jutil/wdreg.c /wk-wnn-test/fixed-src/Xsi/Wnn/jutil/wdreg.c
--- /wk-wnn-test/base-src/Xsi/Wnn/jutil/wdreg.c	Mon Nov 30 16:35:05 1992
+++ /wk-wnn-test/fixed-src/Xsi/Wnn/jutil/wdreg.c	Thu Jul  9 05:53:42 1998
@@ -57,6 +57,8 @@
 #include <sys/file.h>
 #include "commonhd.h"
 #include "config.h"
+
+#include "wnn_malloc.h"
 #include "jllib.h"
 #include "jslib.h"
 #include "jh.h"
@@ -99,8 +101,7 @@
     exit(1);
 }
 
-void
-main(argc, argv)
+int main(argc, argv)
 int argc;
 char **argv;
 {
@@ -154,7 +155,7 @@
     if(fname && dic_no != -1)usage();
     if(!fname && dic_no == -1)usage();
 
-    rb.buf = (char *)malloc((unsigned)(rb.size = 0));
+    rb.buf = (char *)malloc0((unsigned)(rb.size = 0));
 
     init_heap(MAX_ENTRIES * HEAP_PER_LINE,
 	      MAX_ENTRIES * YOMI_PER_LINE,
@@ -206,14 +207,14 @@
 	*/
 	fprintf(stderr,
 	"The specified dictionary isn't exist in current environment\n");
-	exit(1);
+	return (1);
     }
     if(info[k].type != WNN_UD_DICT && info[k].type != WNN_REV_DICT){
 	/*
 	fprintf(stderr, "指定された番号の辞書は、登録可能ではありません。\n");
 	*/
 	fprintf(stderr, "The specified dictionary isn't registable\n");
-	exit(1);
+	return (1);
     }
     for(k = 0 ; k < jt.maxserial; k++){
 	if(js_word_add(env, dic_no, jeary[k]->yomi, jeary[k]->kan,
@@ -229,5 +230,5 @@
 	}
 	fprintf(stderr, "Wrote the file back.\n");
     }
-    exit(0);
+    return (0);
 }
diff -ru /wk-wnn-test/base-src/Xsi/Wnn/jutil/wnnkill.c /wk-wnn-test/fixed-src/Xsi/Wnn/jutil/wnnkill.c
--- /wk-wnn-test/base-src/Xsi/Wnn/jutil/wnnkill.c	Tue Jun 28 11:07:31 1994
+++ /wk-wnn-test/fixed-src/Xsi/Wnn/jutil/wnnkill.c	Thu Jul  9 04:35:46 1998
@@ -75,8 +75,8 @@
 int ocode = TTY_HCODE;
 #endif
 
-void
-main(argc, argv)
+
+int main(argc, argv)
 int argc;
 char **argv;
 {
@@ -177,7 +177,7 @@
 	if (serv && *serv) out(serv);
 	out("%s\n",wnn_perror_lang(lang)); 
 /*	fprintf(stderr, "Can't connect to jserver.\n"); */
-	exit(255);
+	return (255);
     }
     if((x = js_kill(js)) > 0){
 	if (x == 1) {
@@ -186,15 +186,15 @@
 	    out("%d Users Exist.\n", x);
 	}
 	out("%s Not Killed.\n", server_env);
-	exit(1);
+	return (1);
     }else if(x == 0){
 	out("%s Terminated\n", server_env);
-	exit(0);
+	return (0);
     }else{
 	out("%s Terminated\n", server_env);
-	exit(2);
+	return (2);
     }
-    exit (0);
+    return (0);
 }
 	
 #ifdef JAPANESE
diff -ru /wk-wnn-test/base-src/Xsi/Wnn/jutil/wnnstat.c /wk-wnn-test/fixed-src/Xsi/Wnn/jutil/wnnstat.c
--- /wk-wnn-test/base-src/Xsi/Wnn/jutil/wnnstat.c	Tue Jun 28 11:07:31 1994
+++ /wk-wnn-test/fixed-src/Xsi/Wnn/jutil/wnnstat.c	Thu Jul  9 05:00:28 1998
@@ -49,6 +49,8 @@
 /*	Version 4.0
  */
 #include <stdio.h>
+
+#include "wnn_malloc.h"
 #include "jslib.h"
 #include "jllib.h"
 #include "jd_sock.h"
@@ -91,9 +93,9 @@
 int com = W_WHO;
 
 struct msg_cat *cd;
+extern char *malloc0();
 
-void
-main(argc,argv)
+int main(argc,argv)
 int argc;
 char **argv;
 {
@@ -200,7 +202,7 @@
     strcat(nlspath, "/%L/%N");
     cd = msg_open("wnnstat.msg", nlspath, lang);
 
-    rb.buf = (char *)malloc((unsigned)(rb.size = 0));
+    rb.buf = (char *)malloc0((unsigned)(rb.size = 0));
 
     if ((server_env = get_server_env(lang)) == NULL) {
 	server_env = WNN_DEF_SERVER_ENV;
@@ -254,7 +256,9 @@
 	printf("Jserver Version %x, Jlib Version %x\n", i, j);
     }
     js_close(js);
-    exit (0);
+/*    exit (0);*/
+
+ return 0;
 }
 
 static void
@@ -518,3 +522,5 @@
     }
     printf("%s", jbuf);
 }
+
+/*#include "../jserver/malloc.c"*/
\ No newline at end of file
diff -ru /wk-wnn-test/base-src/Xsi/Wnn/jutil/wnntouch.c /wk-wnn-test/fixed-src/Xsi/Wnn/jutil/wnntouch.c
--- /wk-wnn-test/base-src/Xsi/Wnn/jutil/wnntouch.c	Tue Sep 22 13:53:27 1992
+++ /wk-wnn-test/fixed-src/Xsi/Wnn/jutil/wnntouch.c	Thu Jul  9 08:03:36 1998
@@ -90,8 +90,7 @@
   exit(1);
 }
 
-void
-main(argc, argv)
+int main(argc, argv)
 int argc;
 char **argv;
 {
@@ -105,20 +104,20 @@
 	if((ifpter = fopen(argv[k] , "r")) == NULL){
 	    fprintf(stderr , "Can't open the input file %s.\n" , argv[k]);
 	    perror("");
-	    exit(1);
+	    return (1);
 	}
 	if(input_file_header(ifpter, &fh) == -1){
 	    fprintf(stderr, "%s %s: It's not a Wnn File.\n", com_name, argv[k]);
-	    exit(1);
+	    return (1);
 	}
 	if(check_inode(ifpter, &fh) == -1){
 	    if(change_file_uniq(&fh, argv[k]) == -1){
 		fprintf(stderr, "%s %s: Can't change file_uniq.\n", com_name, argv[k]);
 		perror("");
-		exit(1);
+		return (1);
 	    }
 	}
 	fclose(ifpter);
     }
-    exit(0);
+    return (0);
 }
diff -ru /wk-wnn-test/base-src/Xsi/Wnn/uum/basic_op.c /wk-wnn-test/fixed-src/Xsi/Wnn/uum/basic_op.c
--- /wk-wnn-test/base-src/Xsi/Wnn/uum/basic_op.c	Thu May 20 10:48:32 1993
+++ /wk-wnn-test/fixed-src/Xsi/Wnn/uum/basic_op.c	Wed Jul  8 08:32:00 1998
@@ -56,6 +56,8 @@
 定義しています。
 */
 #include <stdio.h>
+
+#include "wnn_malloc.h"
 #include "jllib.h"
 #include "commonhd.h"
 #include "sdefine.h"
@@ -92,7 +94,7 @@
   int msg_len = Strlen(msg);
   c_btmp = c_b;
   c_b = &c_b1; 
-  if((c_b->buffer =(w_char *)malloc((buflen  + msg_len)* 2)) == NULL){
+  if((c_b->buffer =(w_char *)malloc0((buflen  + msg_len)* 2)) == NULL){
       print_msg_getc(MSG_GET(2));
       return(-1);
   }
@@ -116,11 +118,11 @@
 
   init_screen();
   if(buffer_in() == -1){
-      free(c_b->buffer);
+      free0(c_b->buffer);
       c_b = c_btmp;
       return(-1);
   }
-  free(c_b->buffer);
+  free0(c_b->buffer);
   Strncpy(buffer , c_b->buffer + msg_len , c_b->maxlen - msg_len);
   buffer[c_b->maxlen - msg_len] = 0;
   c_b = c_btmp;
diff -ru /wk-wnn-test/base-src/Xsi/Wnn/uum/history.c /wk-wnn-test/fixed-src/Xsi/Wnn/uum/history.c
--- /wk-wnn-test/base-src/Xsi/Wnn/uum/history.c	Tue Nov 26 15:48:10 1991
+++ /wk-wnn-test/fixed-src/Xsi/Wnn/uum/history.c	Wed Jul  8 21:54:52 1998
@@ -73,7 +73,7 @@
 int
 init_history()
 {
-    char *malloc();
+    char *malloc0();
     int	size1;
     char *area_pter;
 
@@ -84,7 +84,7 @@
 	return(0);
     }
     size1 = history_cunt * sizeof(struct history);
-    if ((area_pter = malloc(size1)) == NULL) {
+    if ((area_pter = malloc0(size1)) == NULL) {
 	history_cunt = 0;
 	wnn_errorno = WNN_MALLOC_ERR;
 	return(-1);
@@ -108,11 +108,11 @@
 register w_char *wstr;
 register int	n;
 {
-    extern char *malloc();
+    extern char *malloc0();
 
     if (!history_cunt)
 	return(0);
-    if (n <= 0 || n > maxchg || *wstr == NULL) 
+    if (n <= 0 || n > maxchg || *wstr ==(w_char) NULL) 
 	return(-1);
 
     if (n == 1 && NORMAL_CHAR(*wstr)) {
@@ -122,9 +122,9 @@
 	    end_of_history->num = 0;
 	}
 	if (end_of_history->hbuffer == NULL)
-	    end_of_history->hbuffer = (w_char *)malloc(sizeof(w_char));
+	    end_of_history->hbuffer = (w_char *)malloc0(sizeof(w_char));
 	else
-	    end_of_history->hbuffer = (w_char *)realloc(end_of_history->hbuffer,
+	    end_of_history->hbuffer = (w_char *)realloc0(end_of_history->hbuffer,
 				     (end_of_history->num + 1) * sizeof(w_char));
 	Strncpy(end_of_history->hbuffer + end_of_history->num, wstr, 1);
 	if (++(end_of_history->num) >= maxchg)
@@ -144,8 +144,8 @@
     }
     set_up_history();
     if (end_of_history->hbuffer != NULL)
-	free(end_of_history->hbuffer);
-    end_of_history->hbuffer = (w_char *)malloc(n * sizeof(w_char));
+	free0(end_of_history->hbuffer);
+    end_of_history->hbuffer = (w_char *)malloc0(n * sizeof(w_char));
     Strncpy(end_of_history->hbuffer, wstr, n);
     end_of_history->num = n;
 
diff -ru /wk-wnn-test/base-src/Xsi/Wnn/uum/jhlp.c /wk-wnn-test/fixed-src/Xsi/Wnn/uum/jhlp.c
--- /wk-wnn-test/base-src/Xsi/Wnn/uum/jhlp.c	Tue Jul  7 20:10:47 1998
+++ /wk-wnn-test/fixed-src/Xsi/Wnn/uum/jhlp.c	Thu Jul  9 04:02:13 1998
@@ -50,6 +50,8 @@
  */
 #include <stdio.h>
 #include <signal.h>
+
+#include "wnn_malloc.h"
 #include "jllib.h"
 #include "commonhd.h"
 #include "sdefine.h"
@@ -137,7 +139,7 @@
 extern char *optarg;
 extern int optind;
 
-extern char *ttyname(), *malloc(), *getenv();
+extern char *ttyname(), *malloc0(), *getenv();
 
 static void save_signals();
 static void restore_signals();
@@ -148,8 +150,8 @@
   change_size(), default_usage();
 
 /** メイン */
-void
-main(argc, argv)
+
+int main(argc, argv)
 int argc;
 char **argv;
 {
@@ -365,6 +367,8 @@
 #endif	/* defined(uniosu) */
 
     do_main();
+
+ return 0;
 }
 
 /*
@@ -838,7 +842,7 @@
     unsigned char *buf;
     int ml;
 
-    if ((buf = (unsigned char *)malloc(maxchg * 4)) == NULL) {
+    if ((buf = (unsigned char *)malloc0(maxchg * 4)) == NULL) {
 	printf(MSG_GET(2));
 	printf(MSG_GET(3));
 	/*
@@ -950,7 +954,7 @@
 	time_out.tv_usec = 0;
 	for(rfds = sel_ptn;
 #ifdef linux
-	    (sel_ret = select(20, &rfds, 0, 0, NULL)) < 0 && errno == EINTR;
+	    (sel_ret = select(20, (__fd_set*)&rfds, 0, 0, NULL)) < 0 && errno == EINTR;
 #else
 	    (sel_ret = select(20, &rfds, 0, 0, &time_out)) < 0 && errno == EINTR;
 #endif
@@ -994,7 +998,7 @@
 		    i -= j;
 		}
 		mask = 1 << ttyfd;
-		select(32, 0, &mask, 0, 0);
+		select(32, 0,(__fd_set*) &mask, 0, 0);
 	    }
 	    pop_cursor();
 #if defined(uniosu)
@@ -1190,7 +1194,7 @@
 char *value;
 {
     extern char **environ;
-    char *malloc();
+    char *malloc0();
     char **newenv;
     register int i, j;
 
@@ -1201,7 +1205,7 @@
 	}
     }
     if (environ[i] == NULL) {
-	if ((newenv = (char **)malloc((sizeof (char *))*(i + 2))) == NULL) {
+	if ((newenv = (char **)malloc0((sizeof (char *))*(i + 2))) == NULL) {
 	    puts("Can't allocate environ.");
 	    exit(1);
 	}
@@ -1211,7 +1215,7 @@
 	newenv[i + 1] = NULL;
 	environ = newenv;
     }
-    if ((environ[i] = malloc(strlen(var) + strlen(value) + 2)) == NULL) {
+    if ((environ[i] = malloc0(strlen(var) + strlen(value) + 2)) == NULL) {
 	puts("Can't allocate environ area.");
 	exit(1);
     }
diff -ru /wk-wnn-test/base-src/Xsi/Wnn/uum/prologue.c /wk-wnn-test/fixed-src/Xsi/Wnn/uum/prologue.c
--- /wk-wnn-test/base-src/Xsi/Wnn/uum/prologue.c	Fri Aug 19 10:32:14 1994
+++ /wk-wnn-test/fixed-src/Xsi/Wnn/uum/prologue.c	Thu Jul  9 05:01:13 1998
@@ -56,6 +56,8 @@
 #include <ctype.h>
 #include <sys/errno.h>
 #include <pwd.h>
+
+#include "wnn_malloc.h"
 #include "jllib.h"
 #include "commonhd.h"
 #include "config.h"
@@ -77,7 +79,6 @@
 
 
 
-
 /** romkan のイニシャライズ */
 int
 open_romkan()
@@ -136,7 +137,7 @@
 int
 allocate_areas()
 {
-    char *malloc();
+    extern char *malloc0();
     char *area_start;
     char *area_pter;
 
@@ -148,9 +149,9 @@
     total_size = return_buf_len + len1 * 3 + maxbunsetsu * sizeof(int) * 3 +
 		 maxbunsetsu * sizeof(struct wnn_env *);
 
-    if ((area_start = malloc(total_size)) == NULL){
+    if ((area_start = malloc0(total_size)) == NULL){
 	/*
-	fprintf(stderr,"初期化でmalloc不能。\n");
+	fprintf(stderr,"初期化でmalloc0不能。\n");
 	*/
 	fprintf(stderr, MSG_GET(2));
 	return(-1);
@@ -264,7 +265,7 @@
     WnnEnv *save_cur_normal_env = NULL, *save_cur_reverse_env = NULL;
     int (*yes_no_func)();
     void (*puts_func)();
-    extern char *malloc();
+    extern char *malloc0();
 
     if (first == 0) {
 	bun_data_ = NULL;
@@ -283,7 +284,7 @@
 	strcpy(environment, username);
 	strcat(environment, p->env_name_str);
 	if (servername == NULL && def_servername && *def_servername) {
-            servername = malloc(strlen(def_servername)+1);
+            servername = malloc0(strlen(def_servername)+1);
 	    strcpy(servername, def_servername);
         }
 	if (bun_data_ == NULL) {
@@ -327,7 +328,7 @@
 	    if (reverse_servername == NULL && def_reverse_servername
 		&& *def_reverse_servername) {
 		reverse_servername =
-		  malloc(strlen(def_reverse_servername)+1);
+		  malloc0(strlen(def_reverse_servername)+1);
 		strcpy(reverse_servername, def_reverse_servername);
 	    }
             env_reverse = jl_connect_lang(environment, reverse_servername,
@@ -365,3 +366,5 @@
     }
     return(1);
 }
+
+/*#include "../jserver/malloc.c"*/
\ No newline at end of file
diff -ru /wk-wnn-test/base-src/Xsi/Wnn/uum/termcap.c /wk-wnn-test/fixed-src/Xsi/Wnn/uum/termcap.c
--- /wk-wnn-test/base-src/Xsi/Wnn/uum/termcap.c	Fri Mar 26 16:07:38 1993
+++ /wk-wnn-test/fixed-src/Xsi/Wnn/uum/termcap.c	Wed Jul  8 08:34:21 1998
@@ -53,6 +53,8 @@
 #include <sys/errno.h>
 #include "commonhd.h"
 
+
+#include "wnn_malloc.h"
 #include "sdefine.h"
 #include "sheader.h"
 
@@ -267,9 +269,9 @@
 {
     char *name1;
     char *c;
-    extern char *malloc();
+    extern char *malloc0();
 
-    if ((name1 = malloc(strlen(name) + 1024)) == NULL) {
+    if ((name1 = malloc0(strlen(name) + 1024)) == NULL) {
 	return(-1);
     }
     if((c = strsch(name , "li#")) != NULL){
@@ -293,7 +295,7 @@
     remove(name1,":sc");
     remove(name1,":rc");
     setenv("TERMCAP" , name1);
-    free(name1);
+    free0(name1);
     return(0);
 }
 
diff -ru /wk-wnn-test/base-src/Xsi/Wnn/uum/ttyfdslot.c /wk-wnn-test/fixed-src/Xsi/Wnn/uum/ttyfdslot.c
--- /wk-wnn-test/base-src/Xsi/Wnn/uum/ttyfdslot.c	Thu Jul  8 09:05:50 1993
+++ /wk-wnn-test/fixed-src/Xsi/Wnn/uum/ttyfdslot.c	Wed Jul  8 13:52:07 1998
@@ -71,13 +71,13 @@
     register char *p;
     register int slotnum;
 
-    if ((fullnamp = ttyname(fd)) == NULL) return NULL;
+    if ((fullnamp = ttyname(fd)) == NULL) return (int) NULL;
     if ((ttynamp = rindex(fullnamp, '/')) == NULL) {
         ttynamp = fullnamp;
     } else {
         ttynamp++;
     }
-    if ((ttysfp = fopen("/etc/ttys", "r")) == NULL) return NULL;
+    if ((ttysfp = fopen("/etc/ttys", "r")) == NULL) return (int) NULL;
     for (slotnum = 0; fgets(eachslot, SLOTSIZ, ttysfp); ) {
         p = eachslot + strlen(eachslot) - 1;
         if (*p == '\n') *p = '\0';
@@ -88,7 +88,7 @@
         }
     }
     fclose(ttysfp);
-    return NULL;
+    return (int)NULL;
 }
 #endif	/* defined(BSD42) && (! defined(BSD43)) || defined(linux) */
 
diff -ru /wk-wnn-test/base-src/Xsi/Wnn/uum/uif.c /wk-wnn-test/fixed-src/Xsi/Wnn/uum/uif.c
--- /wk-wnn-test/base-src/Xsi/Wnn/uum/uif.c	Fri Aug 19 10:32:17 1994
+++ /wk-wnn-test/fixed-src/Xsi/Wnn/uum/uif.c	Wed Jul  8 08:34:52 1998
@@ -59,6 +59,8 @@
 #include <stdio.h>
 #include "commonhd.h"
 #include "config.h"
+
+#include "wnn_malloc.h"
 #include "jllib.h"
 #include "sdefine.h"
 #include "sheader.h"
@@ -1230,7 +1232,7 @@
 {
     register WnnEnv *p;
 
-    p = (WnnEnv *)malloc(sizeof(WnnEnv));
+    p = (WnnEnv *)malloc0(sizeof(WnnEnv));
     p->host_name = NULL;
     p->env = NULL;
     p->sticky = 0;
diff -ru /wk-wnn-test/base-src/Xsi/Wnn/uum/wnnrc_op.c /wk-wnn-test/fixed-src/Xsi/Wnn/uum/wnnrc_op.c
--- /wk-wnn-test/base-src/Xsi/Wnn/uum/wnnrc_op.c	Fri Aug 19 10:32:18 1994
+++ /wk-wnn-test/fixed-src/Xsi/Wnn/uum/wnnrc_op.c	Wed Jul  8 21:27:40 1998
@@ -54,6 +54,8 @@
 #include <ctype.h>
 #include <sys/errno.h>
 #include <pwd.h>
+
+#include "wnn_malloc.h"
 #include "jllib.h"
 #include "commonhd.h"
 #include "config.h"
@@ -278,17 +280,17 @@
 	    else {
 		s0or1 = s[1];
 		if (def_servername && *def_servername) {
-		    servername = (char *)malloc(strlen(def_servername));
+		    servername = (char *)malloc0(strlen(def_servername));
 		    strcpy(servername, def_servername);
 		} else {
-		    servername = (char *)malloc(strlen(s[0]));
+		    servername = (char *)malloc0(strlen(s[0]));
 		    strcpy(servername, s[0]);
 		}
 	    }
 	    if(expand_expr(s0or1) != 0){
 		fprintf(stderr , "Can't expand %s.\r\n", s0or1);
 	    }
-	    envrcname= (char *)malloc(strlen(s0or1));
+	    envrcname= (char *)malloc0(strlen(s0or1));
 	    strcpy(envrcname, s0or1);
 	}
     } else if(strcmp(code , "setkankanaenv") == 0){
@@ -306,17 +308,17 @@
 		s0or1 = s[1];
 		if (def_reverse_servername && *def_reverse_servername) {
 		    reverse_servername =
-		      (char *)malloc(strlen(def_reverse_servername));
+		      (char *)malloc0(strlen(def_reverse_servername));
 		    strcpy(reverse_servername, def_reverse_servername);
 		} else {
-		    reverse_servername = (char *)malloc(strlen(s[0]));
+		    reverse_servername = (char *)malloc0(strlen(s[0]));
 		    strcpy(reverse_servername, s[0]);
 		}
 	    }
 	    if(expand_expr(s0or1) != 0){
 		fprintf(stderr , "Can't expand %s.\r\n", s0or1);
 	    }
-	    reverse_envrcname= (char *)malloc(strlen(s0or1));
+	    reverse_envrcname= (char *)malloc0(strlen(s0or1));
 	    strcpy(reverse_envrcname, s0or1);
 	}
     } else if(strcmp(code , "setenv") == 0) {
@@ -330,17 +332,17 @@
                 else {
                     s0or1 = s[2];
 		    if (def_servername && *def_servername) {
-			servername = (char *)malloc(strlen(def_servername));
+			servername = (char *)malloc0(strlen(def_servername));
 			strcpy(servername, def_servername);
 		    } else {
-			servername = (char *)malloc(strlen(s[1]));
+			servername = (char *)malloc0(strlen(s[1]));
 			strcpy(servername, s[1]);
 		    }
                 }
                 if(expand_expr(s0or1) != 0) {
 		    fprintf(stderr , "Can't expand %s.\r\n", s0or1);
                 }
-		envrcname = (char *)malloc(strlen(s0or1));
+		envrcname = (char *)malloc0(strlen(s0or1));
 		strcpy(envrcname, s0or1);
 		strcpy(env_name_s, s[0]);
             }
@@ -356,17 +358,17 @@
                     s0or1 = s[2];
 		    if (def_reverse_servername && *def_reverse_servername) {
 			reverse_servername =
-			  (char *)malloc(strlen(def_reverse_servername));
+			  (char *)malloc0(strlen(def_reverse_servername));
 			strcpy(reverse_servername, def_reverse_servername);
 		    } else {
-			reverse_servername = (char *)malloc(strlen(s[1]));
+			reverse_servername = (char *)malloc0(strlen(s[1]));
 			strcpy(reverse_servername, s[1]);
 		    }
                 }
                 if(expand_expr(s0or1) != 0) {
 		    fprintf(stderr , "Can't expand %s.\r\n", s0or1);
                 }
-		reverse_envrcname = (char *)malloc(strlen(s0or1));
+		reverse_envrcname = (char *)malloc0(strlen(s0or1));
 		strcpy(reverse_envrcname, s0or1);
 		strcpy(reverse_env_name_s, s[0]);
             }
@@ -511,7 +513,7 @@
 
     total = 0;
     flag = 0;
-    while(*st != NULL){
+    while(*st != (char)NULL){
 	if (isdigit(*st)){
 	    total = total * 10 + (*st - '0');
 	} else if (*st == '+') {