Attachment #283547 for bug #282904

Lines 54-60 Link Here

(-)xjdic24/Makefile (-1 / +2 lines)
54	#	54	#
55	#LIBS= -lsocket -lnsl	55	#LIBS= -lsocket -lnsl
56	#	56	#
57	CC=gcc -g	57	#CC=gcc -g
		58	CC=gcc
58	all: xjdic_sa xjdic_cl xjdserver xjdxgen exjdxgen	59	all: xjdic_sa xjdic_cl xjdserver xjdxgen exjdxgen
59	client: xjdic_cl	60	client: xjdic_cl
60	server: xjdserver	61	server: xjdserver

Lines 22-28 Link Here

(-)xjdic24/exjdxgen.c (-2 / +2 lines)
22	#include <sys/stat.h>	22	#include <sys/stat.h>
23		23
24	#include <stdio.h>	24	#include <stdio.h>
25	/#include <stdlib.h>/	25	#include <stdlib.h>
26	#include <ctype.h>	26	#include <ctype.h>
27	#include <string.h>	27	#include <string.h>
28	#include "xjdic.h"	28	#include "xjdic.h"
Lines 32-38 Link Here
32	#define EXLIM 100	32	#define EXLIM 100
33		33
34	unsigned char *db;	34	unsigned char *db;
35	unsigned char ENVname[50];	35	__thread unsigned char ENVname[50];
36	unsigned char *dicenv;	36	unsigned char *dicenv;
37	struct stat *buf;	37	struct stat *buf;
38	unsigned long dbyte;	38	unsigned long dbyte;




#include <stdlib.h>
#include <unistd.h>
#include <signal.h>
#include <errno.h>
#include "xjdic.h"

#define CVERBOSE 0
int chk_cnt=0;
__thread unsigned char host[51] = {"localhost"};
unsigned char host[51] = {"localhost"};
unsigned char yn[2];
__thread unsigned int portno = XJ_PORTNO;
char protocol[4] = {"udp"};
int s, elapse;
struct timeval timeout;

fd_set fildesc;
int nfds;
unsigned char *sptr;
__thread int NoDics,CurrDic;
__thread char Dnamet[10][100];

void xjdserver (int type, int dic_no, long index_posn, int sch_str_len,
                unsigned char *sch_str, int *sch_resp, long *res_index, 




#define TRUE 1

#ifdef XJDCLSERV
extern __thread int portno;
extern __thread unsigned char host[];
#endif

extern __thread unsigned char Dnamet[10][100];

int stringcomp(unsigned char *s1, unsigned char *s2);
struct stat buf;

{
	int fx;

	extern __thread char DicDir[];
	char *fnbuff;

	fnbuff = (char *)malloc(strlen(DicDir) + strlen(file_name)+10);

{
	FILE *fx, *fopen();

	extern __thread char DicDir[];
	char *fnbuff;

/* printf ("XFOPEN: fn=%s mode=%s stream_p=%p\n",file_name,file_mode,fx); */

{
	unsigned char xjdicdir[128],rcstr[80],*rcwd;
	int ft,fn;
	extern __thread int thisdic;
	extern __thread char DicDir[];
	FILE *fm,*fopen();

#ifdef XJDDIC
	extern __thread unsigned char Dnamet[10][100],XJDXnamet[10][100];
	extern __thread unsigned char *dicbufft[10];
	extern __thread unsigned long diclent[10], indkent[10],indptrt[10];
	extern __thread int NoDics;
#endif
	extern __thread unsigned char ENVname[], KDNSlist[];
	extern __thread unsigned char EXTJDXname[], EXTname[], Rname[], Vname[], ROMname[];
	extern __thread unsigned char RKname[];
	extern __thread unsigned char filtnames[NOFILT][50],filtcodes[NOFILT][10][10];
	extern __thread int Omode, Jverb, nofilts, filtact[], filtcoden[], filttype[], filton[];
	extern __thread int RVACTIVE;
	extern __thread unsigned char cl_rcfile[];
#ifdef XJDFRONTEND
	extern __thread unsigned char GPL_File[];
	extern __thread unsigned char Clip_File[];
	extern __thread int KImode;
#endif

	strcpy(DicDir,ENVname); /* added by nakahara@debian.org */




static struct termio    orig,new;
#endif

extern __thread unsigned char CBname[100];
extern __thread unsigned char Dnamet[10][100],XJDXnamet[10][100];
extern __thread unsigned char *dicbufft[10];
extern __thread unsigned long diclent[10], indkent[10],indptrt[10];
extern __thread int NoDics,CurrDic;
__thread int thisdic = 0;
int gdicnos[10],gdicmax=0,GDmode=FALSE,gdiclen;
int GDALLmode=FALSE;

FILE *fe, *fex, *fclip, *fopen();

#ifdef XJDCLSERV
extern __thread int portno;
extern __thread unsigned char host[];
#endif

#ifdef XJDDIC
extern __thread unsigned long dichits[10],dicmiss[10];
extern __thread unsigned long indhits[10],indmiss[10];
extern __thread unsigned long vbkills;
#endif

__thread char DicDir[100];
int xfilelen;

pid_t pid;

unsigned char instr[256],radkanj[250][2];
int radnos[250];
unsigned char kanatab[NRKANA*2][7];
__thread int Omode = 0,Smode = 0,Dmode = 0,AKanaMode;
int DRow,DCol,MaxY=MAXLINES,MaxX=MAXCOLS-1,KFlushRes,nok;
unsigned long hittab[NOHITS];
int verblen,DispHit,ksp,hitind,FirstKanj = 0,prieng = FALSE,Extopen=FALSE,NoSkip;
int extlen,extjdxlen;
unsigned char kmodes[2][10] = {"ON","OFF"};
unsigned char kmodes_r[2][10] = {"OFF","ON"};
__thread unsigned long chline,chpos,it;
unsigned char strfilt[10],tempout[80];
unsigned char KSname[50] = {"kanjstroke"};
__thread unsigned char RKname[50] = {"radkfile"};
__thread unsigned char Rname[50] = {"radicals.tm"};
__thread unsigned char ROMname[60] = {"romkana.cnv"};
__thread unsigned char EXTJDXname[80] = {"edictext.xjdx"};
__thread unsigned char EXTname[80] = {"edictext"};
__thread unsigned char Vname[60] = {"vconj"};
__thread unsigned char ENVname[100];
__thread unsigned char cl_rcfile[100];
__thread unsigned char Clip_File[100] = {"clipboard"};
__thread unsigned char GPL_File[100] = {"gnu_licence"};
__thread unsigned char KDNSlist[50];
__thread int jiver = 14;		/*The last time the index structure changed was Version1.4*/
unsigned char sver[] = {SVER};
unsigned char fbuff[512],KLine[KFBUFFSIZE],karray[KANJARRAYSIZE][5];
unsigned char LogLine[200];

};
unsigned char RVon[] = {0x1b,'[','7','m',0};
unsigned char RVoff[] = {0x1b,'[','m',0};
__thread int nofilts=FALSE,filton[NOFILT],filtact[NOFILT],filttype[NOFILT],filtcoden[NOFILT];
__thread unsigned char filtnames[NOFILT][50],filtcodes[NOFILT][10][10];
unsigned char testline[1025],SingleFilter[50];
unsigned char vdicf[VMAX][7],vinfl[VMAX][21],vcomms[41][50];
__thread int strf,Jverb = TRUE,SFFlag=FALSE,vcommno[VMAX];
__thread int ROmode = 1,EMmode = 1,KLmode = 1,KImode = 1,KLRmode,KLcount;
unsigned char vline[250],vstr[13];
unsigned char RadK1[300],RadK2[300],*RKanj1,*RKanj2,*RKSet[10];
unsigned char RKTarg[21];

int clipmode=FALSE;
unsigned char clipstring1[51];
unsigned char clipstring2[51]={"XXXX"};
__thread int RVACTIVE = TRUE;

__thread int DicNum;
long DicLoc;

/*====== Prototypes========================================================*/

Lines 3-9 Link Here

(-)xjdic24/xjdic.h (-1 / +1 lines)
3	#define NRKANA 2502 / size of the romaji to kana tables*/	3	#define NRKANA 2502 / size of the romaji to kana tables*/
4	#define NOFILT 10 /* maximum number of general filters */	4	#define NOFILT 10 /* maximum number of general filters */
5	#define VMAX 600 /* maximum entries in the verb table */	5	#define VMAX 600 /* maximum entries in the verb table */
6	#define DEFAULT_DICDIR "" /* could be: "/usr/local/lib/xjdic" */	6	#define DEFAULT_DICDIR "/usr/share/xjdic" /* could be: "/usr/local/lib/xjdic" */
7	#define NOHITS 1000 /* size of hittab */	7	#define NOHITS 1000 /* size of hittab */
8	#define SPTAG '@' /* character that flags priority entries */	8	#define SPTAG '@' /* character that flags priority entries */
9	#define KFBUFFSIZE 2000 /* size of the KFlush buffer */	9	#define KFBUFFSIZE 2000 /* size of the KFlush buffer */

Lines 34-40 Link Here

(-)xjdic24/xjdrad.c (-1 / +1 lines)
34		34
35	struct stat *xbuf;	35	struct stat *xbuf;
36		36
37	unsigned char RKname[50] = {"radkfile"};	37	__thread unsigned char RKname[50] = {"radkfile"};
38	unsigned char IRKname[50] = {"radkfile"};	38	unsigned char IRKname[50] = {"radkfile"};
39	unsigned char DicDir[100];	39	unsigned char DicDir[100];
40	unsigned char sver[] = {SVER};	40	unsigned char sver[] = {SVER};




#include <signal.h>
#include "xjdic.h"

//__thread unsigned char Dnamet[10][100],XJDXnamet[10][100];
unsigned char CBname[100];
unsigned char *dicbufft[10];
extern __thread unsigned long diclent[10], indlent[10],indptrt[10];
extern __thread int NoDics,CurrDic;
int iterlimit;

/* extern int TRIGGER; */

*/
{
	long lo, hi, itok, lo2, hi2, schix, schiy;
	extern __thread long it;
	int res, i;

	hi = indptrt[dic_no];





unsigned long dbyte;

__thread unsigned char Dnamet[10][100],XJDXnamet[10][100];
unsigned char *dicbufft[10],dntemp[100];
unsigned long *jdxbufft[10];
__thread unsigned long dichits[10],dicmiss[10];
__thread unsigned long indhits[10],indmiss[10];
__thread unsigned long vbkills=0;
__thread unsigned long diclent[10], indlent[10],indptrt[10];
extern __thread int i;
__thread int NoDics,CurrDic;
int xfilelen;

/*====== Prototypes========================================================*/

	int vbo, vbc,ibuff;
	char *myp;
	long it2;
	extern __thread int DicNum;

	it2 = it-1;
/* indordic=0;

	int vbo, vbl,ibuff;
	long *myp;
	long it2;
	extern __thread int DicNum;

/* indordic=1; */
	it2 = it*sizeof(long);

{
	int ibuff,i,iores;
	long maxu,seekoff;
	extern __thread int DicNum;

/* printf("getvbuff - DN: %d offp: %d vbo: %ld\n",DicNum,offp,vbo); */
/*     find a free buffer, or free the LRU one   */

	long testwd[1];
	int diclenx;

	extern __thread int jiver;
	FILE *fpd,*fopen();

	dichits[dn] = 0;

  	int nodread;
	/* struct stat *buf;  no longer used here  */

	extern __thread int jiver;
	FILE *fpd,*fopen();

	printf("Loading Dictionary: %d [%s]\n",dn,DicName(dn));


unsigned char dbchar(unsigned long xit)
{
	extern __thread int DicNum;

	return(dicbufft[DicNum][xit]);
}


unsigned char dbchar(unsigned long xit)
{
	extern __thread int DicNum;
	long it2;

	it2 = xit-1;


unsigned long jindex(unsigned long xit)
{
	extern __thread int DicNum;

	return(jdxbufft[DicNum][xit]);
}

{
	unsigned c1,c2;
	int i,rc1,rc2;
	extern __thread long it;

/* effectively does a strnicmp on two "strings" 
   except it will make katakana and hiragana match (EUC A4 & A5) */




#include <netdb.h>
#include <stdlib.h>
#include <signal.h>
#include <errno.h>
#include "xjdic.h"

#define SVERBOSE 0

void DicSet ();
unsigned char *DicName(int dn);

__thread int portno=XJ_PORTNO;
int DontFork = FALSE;
int alen;
__thread char host[51];

REQ_PDU pdu_in;
RSP_PDU pdu_out;

int sock;

long lo, hi, itok, lo2, hi2, schix, schiy;
__thread int res, i;
__thread long it;
__thread unsigned char ENVname[50];
__thread unsigned char cl_rcfile[100];
__thread int jiver = 14; 
__thread int thisdic = 0;
__thread int DicNum;

extern __thread unsigned char Dnamet[10][100],XJDXnamet[10][100];
extern __thread unsigned char *dicbufft[10];
extern __thread unsigned long diclent[10], indlent[10],indptrt[10];
extern __thread int NoDics,CurrDic;
extern unsigned long diclent[10], indlent[10],indptrt[10];
extern int NoDics,CurrDic;

__thread char DicDir[100];

int passiveUDP(int portno)
{

Lines 23-29 Link Here

(-)xjdic24/xjdxgen.c (-1 / +1 lines)
23	#include <sys/stat.h>	23	#include <sys/stat.h>
24		24
25	#include <stdio.h>	25	#include <stdio.h>
26	/#include <stdlib.h>/	26	#include <stdlib.h>
27	#include <ctype.h>	27	#include <ctype.h>
28	#include <string.h>	28	#include <string.h>
29	#include "xjdic.h"	29	#include "xjdic.h"

Return to bug 282904

Lines 36-46 Link Here

(-)xjdic24/xjdcomm.c (-22 / +22 lines)
36	#define TRUE 1	36	#define TRUE 1
37		37
38	#ifdef XJDCLSERV	38	#ifdef XJDCLSERV
39	extern int portno;	39	extern __thread int portno;
40	extern unsigned char host[];	40	extern __thread unsigned char host[];
41	#endif	41	#endif
42		42
43	extern unsigned char Dnamet[10][100];	43	extern __thread unsigned char Dnamet[10][100];
44		44
45	int stringcomp(unsigned char s1, unsigned char s2);	45	int stringcomp(unsigned char s1, unsigned char s2);
46	struct stat buf;	46	struct stat buf;
Lines 58-64 Link Here
58	{	58	{
59	int fx;	59	int fx;
60		60
61	extern char DicDir[];	61	extern __thread char DicDir[];
62	char *fnbuff;	62	char *fnbuff;
63		63
64	fnbuff = (char *)malloc(strlen(DicDir) + strlen(file_name)+10);	64	fnbuff = (char *)malloc(strlen(DicDir) + strlen(file_name)+10);
Lines 109-115 Link Here
109	{	109	{
110	FILE fx, fopen();	110	FILE fx, fopen();
111		111
112	extern char DicDir[];	112	extern __thread char DicDir[];
113	char *fnbuff;	113	char *fnbuff;
114		114
115	/* printf ("XFOPEN: fn=%s mode=%s stream_p=%p\n",file_name,file_mode,fx); */	115	/* printf ("XFOPEN: fn=%s mode=%s stream_p=%p\n",file_name,file_mode,fx); */
Lines 164-190 Link Here
164	{	164	{
165	unsigned char xjdicdir[128],rcstr[80],*rcwd;	165	unsigned char xjdicdir[128],rcstr[80],*rcwd;
166	int ft,fn;	166	int ft,fn;
167	extern int thisdic;	167	extern __thread int thisdic;
168	extern char DicDir[];	168	extern __thread char DicDir[];
169	FILE fm,fopen();	169	FILE fm,fopen();
170		170
171	#ifdef XJDDIC	171	#ifdef XJDDIC
172	extern unsigned char Dnamet[10][100],XJDXnamet[10][100];	172	extern __thread unsigned char Dnamet[10][100],XJDXnamet[10][100];
173	extern unsigned char *dicbufft[10];	173	extern __thread unsigned char *dicbufft[10];
174	extern unsigned long diclent[10], indkent[10],indptrt[10];	174	extern __thread unsigned long diclent[10], indkent[10],indptrt[10];
175	extern int NoDics;	175	extern __thread int NoDics;
176	#endif	176	#endif
177	extern unsigned char ENVname[], KDNSlist[];	177	extern __thread unsigned char ENVname[], KDNSlist[];
178	extern unsigned char EXTJDXname[], EXTname[], Rname[], Vname[], ROMname[];	178	extern __thread unsigned char EXTJDXname[], EXTname[], Rname[], Vname[], ROMname[];
179	extern unsigned char RKname[];	179	extern __thread unsigned char RKname[];
180	extern unsigned char filtnames[NOFILT][50],filtcodes[NOFILT][10][10];	180	extern __thread unsigned char filtnames[NOFILT][50],filtcodes[NOFILT][10][10];
181	extern int Omode, Jverb, nofilts, filtact[], filtcoden[], filttype[], filton[];	181	extern __thread int Omode, Jverb, nofilts, filtact[], filtcoden[], filttype[], filton[];
182	extern int RVACTIVE;	182	extern __thread int RVACTIVE;
183	extern unsigned char cl_rcfile[];	183	extern __thread unsigned char cl_rcfile[];
184	#ifdef XJDFRONTEND	184	#ifdef XJDFRONTEND
185	extern unsigned char GPL_File[];	185	extern __thread unsigned char GPL_File[];
186	extern unsigned char Clip_File[];	186	extern __thread unsigned char Clip_File[];
187	extern int KImode;	187	extern __thread int KImode;
188	#endif	188	#endif
189		189
190	strcpy(DicDir,ENVname); /* added by nakahara@debian.org */	190	strcpy(DicDir,ENVname); /* added by nakahara@debian.org */

Lines 59-87 Link Here

(-)xjdic24/xjdfrontend.c (-32 / +32 lines)
59	static struct termio orig,new;	59	static struct termio orig,new;
60	#endif	60	#endif
61		61
62	extern unsigned char CBname[100];	62	extern __thread unsigned char CBname[100];
63	extern unsigned char Dnamet[10][100],XJDXnamet[10][100];	63	extern __thread unsigned char Dnamet[10][100],XJDXnamet[10][100];
64	extern unsigned char *dicbufft[10];	64	extern __thread unsigned char *dicbufft[10];
65	extern unsigned long diclent[10], indkent[10],indptrt[10];	65	extern __thread unsigned long diclent[10], indkent[10],indptrt[10];
66	extern int NoDics,CurrDic;	66	extern __thread int NoDics,CurrDic;
67	int thisdic = 0;	67	__thread int thisdic = 0;
68	int gdicnos[10],gdicmax=0,GDmode=FALSE,gdiclen;	68	int gdicnos[10],gdicmax=0,GDmode=FALSE,gdiclen;
69	int GDALLmode=FALSE;	69	int GDALLmode=FALSE;
70		70
71	FILE fe, fex, fclip, fopen();	71	FILE fe, fex, fclip, fopen();
72		72
73	#ifdef XJDCLSERV	73	#ifdef XJDCLSERV
74	extern int portno;	74	extern __thread int portno;
75	extern unsigned char host[];	75	extern __thread unsigned char host[];
76	#endif	76	#endif
77		77
78	#ifdef XJDDIC	78	#ifdef XJDDIC
79	extern unsigned long dichits[10],dicmiss[10];	79	extern __thread unsigned long dichits[10],dicmiss[10];
80	extern unsigned long indhits[10],indmiss[10];	80	extern __thread unsigned long indhits[10],indmiss[10];
81	extern unsigned long vbkills;	81	extern __thread unsigned long vbkills;
82	#endif	82	#endif
83		83
84	char DicDir[100];	84	__thread char DicDir[100];
85	int xfilelen;	85	int xfilelen;
86		86
87	pid_t pid;	87	pid_t pid;
Lines 90-117 Link Here
90	unsigned char instr[256],radkanj[250][2];	90	unsigned char instr[256],radkanj[250][2];
91	int radnos[250];	91	int radnos[250];
92	unsigned char kanatab[NRKANA*2][7];	92	unsigned char kanatab[NRKANA*2][7];
93	int Omode = 0,Smode = 0,Dmode = 0,AKanaMode;	93	__thread int Omode = 0,Smode = 0,Dmode = 0,AKanaMode;
94	int DRow,DCol,MaxY=MAXLINES,MaxX=MAXCOLS-1,KFlushRes,nok;	94	int DRow,DCol,MaxY=MAXLINES,MaxX=MAXCOLS-1,KFlushRes,nok;
95	unsigned long hittab[NOHITS];	95	unsigned long hittab[NOHITS];
96	int verblen,DispHit,ksp,hitind,FirstKanj = 0,prieng = FALSE,Extopen=FALSE,NoSkip;	96	int verblen,DispHit,ksp,hitind,FirstKanj = 0,prieng = FALSE,Extopen=FALSE,NoSkip;
97	int extlen,extjdxlen;	97	int extlen,extjdxlen;
98	unsigned char kmodes[2][10] = {"ON","OFF"};	98	unsigned char kmodes[2][10] = {"ON","OFF"};
99	unsigned char kmodes_r[2][10] = {"OFF","ON"};	99	unsigned char kmodes_r[2][10] = {"OFF","ON"};
100	unsigned long chline,chpos,it;	100	__thread unsigned long chline,chpos,it;
101	unsigned char strfilt[10],tempout[80];	101	unsigned char strfilt[10],tempout[80];
102	unsigned char KSname[50] = {"kanjstroke"};	102	unsigned char KSname[50] = {"kanjstroke"};
103	unsigned char RKname[50] = {"radkfile"};	103	__thread unsigned char RKname[50] = {"radkfile"};
104	unsigned char Rname[50] = {"radicals.tm"};	104	__thread unsigned char Rname[50] = {"radicals.tm"};
105	unsigned char ROMname[60] = {"romkana.cnv"};	105	__thread unsigned char ROMname[60] = {"romkana.cnv"};
106	unsigned char EXTJDXname[80] = {"edictext.xjdx"};	106	__thread unsigned char EXTJDXname[80] = {"edictext.xjdx"};
107	unsigned char EXTname[80] = {"edictext"};	107	__thread unsigned char EXTname[80] = {"edictext"};
108	unsigned char Vname[60] = {"vconj"};	108	__thread unsigned char Vname[60] = {"vconj"};
109	unsigned char ENVname[100];	109	__thread unsigned char ENVname[100];
110	unsigned char cl_rcfile[100];	110	__thread unsigned char cl_rcfile[100];
111	unsigned char Clip_File[100] = {"clipboard"};	111	__thread unsigned char Clip_File[100] = {"clipboard"};
112	unsigned char GPL_File[100] = {"gnu_licence"};	112	__thread unsigned char GPL_File[100] = {"gnu_licence"};
113	unsigned char KDNSlist[50];	113	__thread unsigned char KDNSlist[50];
114	int jiver = 14; /The last time the index structure changed was Version1.4/	114	__thread int jiver = 14; /The last time the index structure changed was Version1.4/
115	unsigned char sver[] = {SVER};	115	unsigned char sver[] = {SVER};
116	unsigned char fbuff[512],KLine[KFBUFFSIZE],karray[KANJARRAYSIZE][5];	116	unsigned char fbuff[512],KLine[KFBUFFSIZE],karray[KANJARRAYSIZE][5];
117	unsigned char LogLine[200];	117	unsigned char LogLine[200];
Lines 148-159 Link Here
148	};	148	};
149	unsigned char RVon[] = {0x1b,'[','7','m',0};	149	unsigned char RVon[] = {0x1b,'[','7','m',0};
150	unsigned char RVoff[] = {0x1b,'[','m',0};	150	unsigned char RVoff[] = {0x1b,'[','m',0};
151	int nofilts=FALSE,filton[NOFILT],filtact[NOFILT],filttype[NOFILT],filtcoden[NOFILT];	151	__thread int nofilts=FALSE,filton[NOFILT],filtact[NOFILT],filttype[NOFILT],filtcoden[NOFILT];
152	unsigned char filtnames[NOFILT][50],filtcodes[NOFILT][10][10];	152	__thread unsigned char filtnames[NOFILT][50],filtcodes[NOFILT][10][10];
153	unsigned char testline[1025],SingleFilter[50];	153	unsigned char testline[1025],SingleFilter[50];
154	unsigned char vdicf[VMAX][7],vinfl[VMAX][21],vcomms[41][50];	154	unsigned char vdicf[VMAX][7],vinfl[VMAX][21],vcomms[41][50];
155	int strf,Jverb = TRUE,SFFlag=FALSE,vcommno[VMAX];	155	__thread int strf,Jverb = TRUE,SFFlag=FALSE,vcommno[VMAX];
156	int ROmode = 1,EMmode = 1,KLmode = 1,KImode = 1,KLRmode,KLcount;	156	__thread int ROmode = 1,EMmode = 1,KLmode = 1,KImode = 1,KLRmode,KLcount;
157	unsigned char vline[250],vstr[13];	157	unsigned char vline[250],vstr[13];
158	unsigned char RadK1[300],RadK2[300],RKanj1,RKanj2,*RKSet[10];	158	unsigned char RadK1[300],RadK2[300],RKanj1,RKanj2,*RKSet[10];
159	unsigned char RKTarg[21];	159	unsigned char RKTarg[21];
Lines 163-171 Link Here
163	int clipmode=FALSE;	163	int clipmode=FALSE;
164	unsigned char clipstring1[51];	164	unsigned char clipstring1[51];
165	unsigned char clipstring2[51]={"XXXX"};	165	unsigned char clipstring2[51]={"XXXX"};
166	int RVACTIVE = TRUE;	166	__thread int RVACTIVE = TRUE;
167		167
168	int DicNum;	168	__thread int DicNum;
169	long DicLoc;	169	long DicLoc;
170		170
171	/====== Prototypes========================================================/	171	/====== Prototypes========================================================/

Lines 41-54 Link Here

(-)xjdic24/xjdservcomm.c (-15 / +16 lines)
41		41
42	unsigned long dbyte;	42	unsigned long dbyte;
43		43
44	unsigned char Dnamet[10][100],XJDXnamet[10][100];	44	__thread unsigned char Dnamet[10][100],XJDXnamet[10][100];
45	unsigned char *dicbufft[10],dntemp[100];	45	unsigned char *dicbufft[10],dntemp[100];
46	unsigned long *jdxbufft[10];	46	unsigned long *jdxbufft[10];
47	unsigned long dichits[10],dicmiss[10];	47	__thread unsigned long dichits[10],dicmiss[10];
48	unsigned long indhits[10],indmiss[10];	48	__thread unsigned long indhits[10],indmiss[10];
49	unsigned long vbkills=0;	49	__thread unsigned long vbkills=0;
50	unsigned long diclent[10], indlent[10],indptrt[10];	50	__thread unsigned long diclent[10], indlent[10],indptrt[10];
51	int i,NoDics,CurrDic;	51	extern __thread int i;
		52	__thread int NoDics,CurrDic;
52	int xfilelen;	53	int xfilelen;
53		54
54	/====== Prototypes========================================================/	55	/====== Prototypes========================================================/
Lines 97-103 Link Here
97	int vbo, vbc,ibuff;	98	int vbo, vbc,ibuff;
98	char *myp;	99	char *myp;
99	long it2;	100	long it2;
100	extern int DicNum;	101	extern __thread int DicNum;
101		102
102	it2 = it-1;	103	it2 = it-1;
103	/* indordic=0;	104	/* indordic=0;
Lines 130-136 Link Here
130	int vbo, vbl,ibuff;	131	int vbo, vbl,ibuff;
131	long *myp;	132	long *myp;
132	long it2;	133	long it2;
133	extern int DicNum;	134	extern __thread int DicNum;
134		135
135	/* indordic=1; */	136	/* indordic=1; */
136	it2 = it*sizeof(long);	137	it2 = it*sizeof(long);
Lines 160-166 Link Here
160	{	161	{
161	int ibuff,i,iores;	162	int ibuff,i,iores;
162	long maxu,seekoff;	163	long maxu,seekoff;
163	extern int DicNum;	164	extern __thread int DicNum;
164		165
165	/* printf("getvbuff - DN: %d offp: %d vbo: %ld\n",DicNum,offp,vbo); */	166	/* printf("getvbuff - DN: %d offp: %d vbo: %ld\n",DicNum,offp,vbo); */
166	/* find a free buffer, or free the LRU one */	167	/* find a free buffer, or free the LRU one */
Lines 235-241 Link Here
235	long testwd[1];	236	long testwd[1];
236	int diclenx;	237	int diclenx;
237		238
238	extern int jiver;	239	extern __thread int jiver;
239	FILE fpd,fopen();	240	FILE fpd,fopen();
240		241
241	dichits[dn] = 0;	242	dichits[dn] = 0;
Lines 265-271 Link Here
265	int nodread;	266	int nodread;
266	/* struct stat buf; no longer used here /	267	/* struct stat buf; no longer used here /
267		268
268	extern int jiver;	269	extern __thread int jiver;
269	FILE fpd,fopen();	270	FILE fpd,fopen();
270		271
271	printf("Loading Dictionary: %d [%s]\n",dn,DicName(dn));	272	printf("Loading Dictionary: %d [%s]\n",dn,DicName(dn));
Lines 381-387 Link Here
381		382
382	unsigned char dbchar(unsigned long xit)	383	unsigned char dbchar(unsigned long xit)
383	{	384	{
384	extern int DicNum;	385	extern __thread int DicNum;
385		386
386	return(dicbufft[DicNum][xit]);	387	return(dicbufft[DicNum][xit]);
387	}	388	}
Lines 394-400 Link Here
394		395
395	unsigned char dbchar(unsigned long xit)	396	unsigned char dbchar(unsigned long xit)
396	{	397	{
397	extern int DicNum;	398	extern __thread int DicNum;
398	long it2;	399	long it2;
399		400
400	it2 = xit-1;	401	it2 = xit-1;
Lines 408-414 Link Here
408		409
409	unsigned long jindex(unsigned long xit)	410	unsigned long jindex(unsigned long xit)
410	{	411	{
411	extern int DicNum;	412	extern __thread int DicNum;
412		413
413	return(jdxbufft[DicNum][xit]);	414	return(jdxbufft[DicNum][xit]);
414	}	415	}
Lines 422-428 Link Here
422	{	423	{
423	unsigned c1,c2;	424	unsigned c1,c2;
424	int i,rc1,rc2;	425	int i,rc1,rc2;
425	extern long it;	426	extern __thread long it;
426		427
427	/* effectively does a strnicmp on two "strings"	428	/* effectively does a strnicmp on two "strings"
428	except it will make katakana and hiragana match (EUC A4 & A5) */	429	except it will make katakana and hiragana match (EUC A4 & A5) */

Lines 36-49 Link Here

(-)xjdic24/xjdclient.c (-5 / +5 lines)
36	#include <stdlib.h>	36	#include <stdlib.h>
37	#include <unistd.h>	37	#include <unistd.h>
38	#include <signal.h>	38	#include <signal.h>
		39	#include <errno.h>
39	#include "xjdic.h"	40	#include "xjdic.h"
40		41
41	#define CVERBOSE 0	42	#define CVERBOSE 0
42	int chk_cnt=0;	43	int chk_cnt=0;
43	extern int errno;	44	__thread unsigned char host[51] = {"localhost"};
44	unsigned char host[51] = {"localhost"};
45	unsigned char yn[2];	45	unsigned char yn[2];
46	unsigned int portno = XJ_PORTNO;	46	__thread unsigned int portno = XJ_PORTNO;
47	char protocol[4] = {"udp"};	47	char protocol[4] = {"udp"};
48	int s, elapse;	48	int s, elapse;
49	struct timeval timeout;	49	struct timeval timeout;
Lines 59-66 Link Here
59	fd_set fildesc;	59	fd_set fildesc;
60	int nfds;	60	int nfds;
61	unsigned char *sptr;	61	unsigned char *sptr;
62	int NoDics,CurrDic;	62	__thread int NoDics,CurrDic;
63	char Dnamet[10][100];	63	__thread char Dnamet[10][100];
64		64
65	void xjdserver (int type, int dic_no, long index_posn, int sch_str_len,	65	void xjdserver (int type, int dic_no, long index_posn, int sch_str_len,
66	unsigned char sch_str, int sch_resp, long *res_index,	66	unsigned char sch_str, int sch_resp, long *res_index,

Lines 30-40 Link Here

(-)xjdic24/xjdsa.c (-4 / +4 lines)
30	#include <signal.h>	30	#include <signal.h>
31	#include "xjdic.h"	31	#include "xjdic.h"
32		32
33	unsigned char Dnamet[10][100],XJDXnamet[10][100];	33	//__thread unsigned char Dnamet[10][100],XJDXnamet[10][100];
34	unsigned char CBname[100];	34	unsigned char CBname[100];
35	unsigned char *dicbufft[10];	35	unsigned char *dicbufft[10];
36	unsigned long diclent[10], indlent[10],indptrt[10];	36	extern __thread unsigned long diclent[10], indlent[10],indptrt[10];
37	int NoDics,CurrDic;	37	extern __thread int NoDics,CurrDic;
38	int iterlimit;	38	int iterlimit;
39		39
40	/* extern int TRIGGER; */	40	/* extern int TRIGGER; */
Lines 67-73 Link Here
67	*/	67	*/
68	{	68	{
69	long lo, hi, itok, lo2, hi2, schix, schiy;	69	long lo, hi, itok, lo2, hi2, schix, schiy;
70	extern long it;	70	extern __thread long it;
71	int res, i;	71	int res, i;
72		72
73	hi = indptrt[dic_no];	73	hi = indptrt[dic_no];

Lines 28-33 Link Here

(-)xjdic24/xjdserver.c (-17 / +16 lines)
28	#include <netdb.h>	28	#include <netdb.h>
29	#include <stdlib.h>	29	#include <stdlib.h>
30	#include <signal.h>	30	#include <signal.h>
		31	#include <errno.h>
31	#include "xjdic.h"	32	#include "xjdic.h"
32		33
33	#define SVERBOSE 0	34	#define SVERBOSE 0
Lines 36-45 Link Here
36	void DicSet ();	37	void DicSet ();
37	unsigned char *DicName(int dn);	38	unsigned char *DicName(int dn);
38		39
39	int portno=XJ_PORTNO;	40	__thread int portno=XJ_PORTNO;
40	int DontFork = FALSE;	41	int DontFork = FALSE;
41	int alen;	42	int alen;
42	char host[51];	43	__thread char host[51];
43		44
44	REQ_PDU pdu_in;	45	REQ_PDU pdu_in;
45	RSP_PDU pdu_out;	46	RSP_PDU pdu_out;
Lines 48-69 Link Here
48	int sock;	49	int sock;
49		50
50	long lo, hi, itok, lo2, hi2, schix, schiy;	51	long lo, hi, itok, lo2, hi2, schix, schiy;
51	int res, i;	52	__thread int res, i;
52	long it;	53	__thread long it;
53	unsigned char ENVname[50];	54	__thread unsigned char ENVname[50];
54	unsigned char cl_rcfile[100];	55	__thread unsigned char cl_rcfile[100];
55	int jiver = 14;	56	__thread int jiver = 14;
56	int thisdic = 0;	57	__thread int thisdic = 0;
57	int DicNum;	58	__thread int DicNum;
58		59
59	extern int errno;	60	extern __thread unsigned char Dnamet[10][100],XJDXnamet[10][100];
60		61	extern __thread unsigned char *dicbufft[10];
61	extern unsigned char Dnamet[10][100],XJDXnamet[10][100];	62	extern __thread unsigned long diclent[10], indlent[10],indptrt[10];
62	extern unsigned char *dicbufft[10];	63	extern __thread int NoDics,CurrDic;
63	extern unsigned long diclent[10], indlent[10],indptrt[10];
64	extern int NoDics,CurrDic;
65		64
66	char DicDir[100];	65	__thread char DicDir[100];
67		66
68	int passiveUDP(int portno)	67	int passiveUDP(int portno)
69	{	68	{