summaryrefslogtreecommitdiff
path: root/japanese/dserver/files/patch-ab
blob: f6e8e9c9dccdb7128536c21b93b277499e141758 (plain) (blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
patches for server2.2-pl2
--- server2.2-pl2/daemon.c.orig	Sat Aug 10 02:10:32 1996
+++ server2.2-pl2/daemon.c	Tue Jan 28 08:22:42 1997
@@ -13,6 +13,11 @@
 #include <sys/time.h>
 #include <ctype.h>
 
+#ifdef __FreeBSD__
+#include <stdlib.h>
+#include <string.h>
+#endif
+
 #ifdef linux
 #include <string.h>
 #include <stdlib.h>
@@ -34,10 +39,11 @@
 #include "ndtp.h"
 #include "misc.h"
 
-
+#ifndef __FreeBSD__
 #ifdef DEBUG
 extern int debug;
 #endif
+#endif
 
 ENV env[MAXUSER];
 
@@ -104,8 +110,11 @@
 #endif
 		exit(1);
 	}
-
+#ifdef __FreeBSD__
+	if( bind(ls, (struct sockaddr *)&myaddr_in, sizeof(struct sockaddr_in)) == -1)  {
+#else
 	if( bind(ls, &myaddr_in, sizeof(struct sockaddr_in)) == -1)  {
+#endif
 #ifdef SYSLOG
 		syslog(LOG_ERR,"Unable to bind address /iserver_init\n");
 #endif
--- server2.2-pl2/lookup.c.orig	Sat Aug 10 02:10:32 1996
+++ server2.2-pl2/lookup.c	Tue Jan 28 08:22:42 1997
@@ -501,6 +501,54 @@
 	else return q+6;
 }
 
+#ifdef HALF
+reg_jisstrnsub_(s,t,r,n,CODE)
+unsigned char *s, *t;
+int r,n;
+int CODE;
+{
+	unsigned int ss,tt;
+	if (CODE == FULL) {
+	  for(; ; s+=2,t+=2,n-=2) {
+	    ss = (*s&0x7f)<<8|*(s+1)&0x7f;
+	    tt = (*t&0x7f)<<8|*(t+1)&0x7f;
+	    if (n <= 0)  tt = 0; /* string terminate 95.2.8 by T.Motoda */
+	    
+		if(r==SHORT && (ss=='*' || ss=='?')) {
+			return 0;
+		}
+		if(r==WHOLE && (ss=='*')) {
+			return 0;
+		}
+		if(!ss || !tt) break;
+		if(r==WHOLE && (ss=='?')) {
+			continue;
+		}
+		if(ss!=tt) break;
+	  }
+	} else {
+	  for(; ; s++,t++,n--) {
+	    ss = (*s);
+	    tt = (*t);
+	    if (n <= 0)  tt = 0; /* string terminate 95.2.8 by T.Motoda */
+	    
+		if(r==SHORT && (ss=='*' || ss=='?')) {
+			return 0;
+		}
+		if(r==WHOLE && (ss=='*')) {
+			return 0;
+		}
+		if(!ss || !tt) break;
+		if(r==WHOLE && (ss=='?')) {
+			continue;
+		}
+		if(ss!=tt) break;
+	  }
+	}
+	return ss-tt;
+}
+#endif
+
 findentry_int(key,realkey,frm,env_p)
 unsigned char *key,*realkey;
 ENV *env_p;
@@ -509,6 +557,9 @@
 	unsigned char frame[FRAMESIZE+2];
 	static char msg[32];
 	Dict *dict;
+#ifdef HALF
+	int CODE=dict_set[env_p->dict_num].code; /* FULL or HALF */
+#endif
 
 	dict=env_p->dict;
 
@@ -542,12 +593,21 @@
 				putnstr(q,s);
 				printf("\n");
 #endif
+#ifdef HALF
+				if(reg_jisstrnsub_(key,q,SHORT,s,CODE)<=0) {
+					findentry_int(key,realkey,FOURBYTEUINT(q+s),env_p);
+				}
+				if(reg_jisstrnsub_(key,q,SHORT,s,CODE)<0) {
+					return;
+				}
+#else
 				if(reg_jisstrnsub(key,q,SHORT,s)<=0) {
 					findentry_int(key,realkey,FOURBYTEUINT(q+s),env_p);
 				}
 				if(reg_jisstrnsub(key,q,SHORT,s)<0) {
 					return;
 				}
+#endif
 			}
 		}
 		else if(frame[1]==0) {
@@ -625,7 +685,11 @@
 						putnstr(q,s);
 #endif
 						if(!match) {
+#ifdef HALF
+							match=!reg_jisstrnsub_(realkey,q,WHOLE,s,CODE);
+#else
 							match=!reg_jisstrnsub(realkey,q,WHOLE,s);
+#endif
 						}
 						q+=s;
 #ifdef DEBUG
@@ -644,7 +708,11 @@
 					putnstr(q,s);
 #endif
 					if(!match) {
+#ifdef HALF
+						match=!reg_jisstrnsub_(realkey,q,WHOLE,s,CODE);
+#else
 						match=!reg_jisstrnsub(realkey,q,WHOLE,s);
+#endif
 					}
 #ifdef DEBUG
 					putchar('\n');
--- server2.2-pl2/Makefile.orig	Sat Aug 10 02:12:05 1996
+++ server2.2-pl2/Makefile	Tue Jan 28 08:22:43 1997
@@ -2,33 +2,39 @@
 #CC=cc
 CC=gcc
 
-DSERVERTOPDIR=/usr/local/etc/dserverdir
+DSERVERTOPDIR=${PREFIX}/lib/dserver
 #DSERVERTOPDIR=/nfs/home40/usui/dserver/server2.2-current/table
-DICTROOT=/usr/local/dict
+DICTROOT=${PREFIX}/share/dict
 ACCESSFILE=${DSERVERTOPDIR}/dserver_access
 
-BINDIR=/usr/local/lib
+BINDIR=${PREFIX}/lib/dserver
+DOCDIR=${DSERVERTOPDIR}/doc
+LISPLIB=${PREFIX}/lib/mule/site-lisp
 #LISPLIB=/usr/local/lib/Nemacs/lisp #usui
 
 DEFS=-D'ACCESSFILE="$(ACCESSFILE)"' \
--D'DSERVERTOPDIR="$(DSERVERTOPDIR)"'
+-D'DSERVERTOPDIR="$(DSERVERTOPDIR)"' -DHALF
 
 # define AUTH for auth
 # define DICLOOKUPMULE for mule
-OFLAG=
-CFLAGS= $(OFLAG) -DSTANDALONE $(DEFS) -DDEBUG -DSYSLOG
-CFLAGS=-Dsparc $(OFLAG) -DSYSLOG -DSTANDALONE $(DEFS)
+OFLAG= -O -m486
+#CFLAGS= $(OFLAG) -DSTANDALONE $(DEFS) -DDEBUG -DSYSLOG
+#CFLAGS=-Dsparc $(OFLAG) -DSYSLOG -DSTANDALONE $(DEFS)
 #CFLAGS=-Dsparc $(OFLAG) -DSYSLOG -DAUTH -DDICLOOKUPMULE -DSTANDALONE $(DEFS)
-CFLAGS=-Dsparc $(OFLAG) -DSYSLOG -DSTANDALONE $(DEFS) -DDEBUG
+#CFLAGS=-Dsparc $(OFLAG) -DSYSLOG -DSTANDALONE $(DEFS) -DDEBUG
+CFLAGS= $(OFRAG) -DSTANDALONE -DSYSLOG $(DEFS)
 
 #for solaris
 #CFLAGS=-Dsolaris -Dsparc $(OFLAG) -DSYSLOG -DSTANDALONE $(DEFS)
 #DFLAGS =-lsocket -lnsl -R/usr/ucblib -L/usr/ucblib -lucb
 
-all: dserver
+all: dserver compress/makedic
 dserver: $(OBJ)
 	$(CC) $(CFLAGS) -o dserver $(OBJ)
 
+compress/makedic:
+	(cd compress ; ${MAKE} all)
+
 #dserver: $(OBJ)
 #	$(CC) $(CFLAGS) -o dserver $(OBJ) $(DFLAGS)
 
@@ -39,4 +45,12 @@
 	lint -Dsparc -DSTANDALONE -DSYSLOG $(DEFS) *.c
 
 install:
-	install -m 755 dserver $(BINDIR)
+	if  [ ! -d ${DOCDIR} ] ; then mkdir -p ${DOCDIR} ; fi
+	if  [ ! -d ${DICTROOT}/cdrom ] ; then mkdir -p ${DICTROOT}/cdrom ; fi
+	install -c -s -m 755 dserver $(BINDIR)
+	(cd compress ; ${MAKE} install)
+	cp table/*.tbl table/dserver_access ${DSERVERTOPDIR}
+	cat table/dserver_access | sed -e 's!PREFIX_DIR!${PREFIX}!g'  > ${DSERVERTOPDIR}/dserver_access
+	cp CHANGES newfeature.doc ${DOCDIR}
+	cp README ${DOCDIR}/README.dserver
+	cp table/README ${DOCDIR}/README.table
--- server2.2-pl2/subnet.c.orig	Sat Aug 10 02:10:30 1996
+++ server2.2-pl2/subnet.c	Tue Jan 28 08:22:43 1997
@@ -1,6 +1,7 @@
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
+#include <sys/time.h>
 #include <net/if.h>
 #include <sys/ioctl.h>
 
--- server2.2-pl2/table/dserver_access.orig	Sat Aug 10 02:10:27 1996
+++ server2.2-pl2/table/dserver_access	Tue Jan 28 08:22:43 1997
@@ -1,14 +1,20 @@
-#DICT kojien /usr/local/etc/CDdict/yrrs096/koujien/start. "�������裴��" 1  600
-##DICT eiwa /usr/local/etc/CDdict/yrrs118/chujiten/start. "����������" 25 600
-##DICT eiwa /usr/local/etc/CDdict/yrrs118/chujiten/start.comp "����������" 25 600
-##DICT eiwa /usr/local/etc/CDdict/yrrs009/eiwa/start.comp "����������" 25 600
-##DICT waei /usr/local/etc/CDdict/yrrs118/chujiten/start.comp "��������±�" 25 600
-#DICT waei /usr/local/etc/CDdict/cdchujiten/chujiten/data/honmon. "��������±�" 25 600
-#DICT eiwa /usr/local/etc/CDdict/cdchujiten/chujiten/data/honmon. "��������±�" 25 600
-#DICT CDkojien /usr/local/etc/CDdict/cdkouji/koujien/data/honmon. "��������" 1  600
-#DICT readers /usr/local/etc/CDdict/yrrs172/readers/start. "�꡼����������" 1  600
-#DICTROOT /usr/local/etc/CDdict 2 500
+#DICT kojien PREFIX_DIR/share/dict/cdrom/yrrs096/koujien/start "�������裴��" 1  600
+#DICT kojien-furoku PREFIX_DIR/share/dict/cdrom/yrrs096/furoku/start "�������裴����Ͽ" 1  600
+#DICT waei PREFIX_DIR/share/dict/cdrom/cdchujiten/chujiten/data/honmon "��������±�" 25 600
+#DICT eiwa PREFIX_DIR/share/dict/cdrom/cdchujiten/chujiten/data/honmon "��������±�" 25 600
+#DICT readers PREFIX_DIR/share/dict/cdrom/yrrs172/readers/start "�꡼����������" 1  600
+#DICT crfre PREFIX_DIR/share/dict/cdrom/yrrs091/crfre/start "����Ʋ���饦��ʩ��" 1  600
+#DICT crger PREFIX_DIR/share/dict/cdrom/yrrs092/crger/start "����Ʋ���饦������" 1  600
+#DICT italian /usr/local/share/dict/cdrom/yrrs214/jiten/start "���奤���ꥢ��ɽ����ŵ" 1  600
+#DICT italian-j /usr/local/share/dict/cdrom/yrrs214/jiten/start "���奤���ꥢ��ɽ����ŵ" 1  600
+#DICT oxford /usr/local/share/dict/cdrom/san042/oxford/start "OxfordEnglishDictionary" 1  600
+#DICT CDkojien PREFIX_DIR/share/dict/cdrom/cdkouji/koujien/data/honmon "��������" 1  600
+#DICTROOT PREFIX_DIR/share/dict/cdrom 2 500
 ## access controle
 #
-topics
+localhost
 #
+##DICT eiwa PREFIX_DIR/share/dict/cdrom/yrrs118/chujiten/start "����������" 25 600
+##DICT waei PREFIX_DIR/share/dict/cdrom/yrrs118/chujiten/start "����������" 25 600
+##DICT eiwa PREFIX_DIR/share/dict/cdrom/yrrs118/chujiten/start.comp "����������" 25 600
+##DICT waei PREFIX_DIR/share/dict/cdrom/yrrs118/chujiten/start.comp "��������±�" 25 600
--- server2.2-pl2/compress/Makefile.orig	Sat Aug 10 02:10:29 1996
+++ server2.2-pl2/compress/Makefile	Tue Jan 28 08:22:43 1997
@@ -11,11 +11,15 @@
 CFLAGS = -O -Wall
 LFLAGS =
 
+
 OBJ1 = main.o compress.o
 
 
 OBJS = $(OBJ1)
 PROG = makedic
+BINDIR = ${PREFIX}/bin
+
+all: $(PROG)
 
 $(PROG)		:	$(OBJS)
 	$(CC) $(OBJS) $(LFLAGS) -o $(PROG)
@@ -26,5 +30,8 @@
 main.o : defs.h
 comp.o : defs.h
 
+install: $(PROG)
+	install -s $(PROG) $(BINDIR)
+
 clean:
-	rm -f *.o core makedic *~
+	rm -f *.o core makedic *~
--- server2.2-pl2/compress/main.c.orig	Sat Aug 10 02:10:30 1996
+++ server2.2-pl2/compress/main.c	Tue Jan 28 08:22:43 1997
@@ -3,6 +3,21 @@
 					by toshioji@darkover.iijnet.or.jp
 
 	dic version 0.24 cdio.c by kmiya ����򸵤˺���
+
+========== dic.man �����ѳ��� ==========
+DIC(1)                   Dic Users Manual                  DIC(1)
+
+
+DISTRIBUTION
+       ���Υץ������β��� �ܿ� ž�� �ʤɤϡ� ��ͳ�˹ԤäƤ� ���
+       �Ʒ빽�Ǥ��� �ޤ��� ��Ԥ���𤹤�ɬ�פ⤢��ޤ���
+
+       �� �� ��С����Ѥ��줿ʪ�Ǥ��뤳�Ȥ������ʤɤΥСݥ�����
+       Dic ��ɤΤ褦���ѹ��������ˤ򤷤Ƥ���������й����Ǥ���
+
+       ����˥��ݥ����ݥɤ�Ʊ���˸������Ƥ��������Ƥ���ʤ���� ��
+       ��ͳ�� �Ԥ���褦�ˤ��뤳�Ȥ��˾���ޤ���
+========== dic.man �����ѽ�λ ==========
  */
 
 #include    "defs.h"
@@ -36,10 +51,95 @@
   return 0;
 }
 
+char ok(char *string)
+{
+  char key_buf[2];
+
+  fputs( string, stdout );
+  fgets( key_buf, 2, stdin );
+  return key_buf[0];
+}
+
+void caution(void)
+{
+
+  puts("<<<<<<<<< makedic ��Ȥ������ˢ�ɬ�����ʲ������Ƥ��ǧ��������>>>>>>>>>
+
+����� dserver/server2.1/README�ּ�ɮ   ���� ����š��Ķ������ƥฦ����
+����饤���󥹴ط��ε��Ҥ�ȴ����������ΤǤ���
+
+==================== dserver/server2.1/README ====================
+
+  �饤���󥹤Ϥ����ȼ�äƲ�����,�ʲ��˻��ĵ�Ϻ<mita@jp.FreeBSD.org>
+  ����Ĵ�٤Ʋ����ä�ʸ�Ϥ�ź�դ��ޤ�.
+
+------------------------------------------------------------------------
+" );
+  ok( "<���ԥ����򲡤��Ʋ�����>" );
+
+  puts("
+ �饤���󥹤ˤĤ���   ���ĵ�Ϻ <mita@jp.FreeBSD.org>
+ 
+ dserver�ϡ�8cmCDROM�Ǹ���ҿ����¡��±��漭ŵ�����Ƚ�Ź�������
+ �Ϥ�Ȥ��롢�Żҥ֥å����ɤळ�Ȥ�����ޤ������ѤΤ��Ӥ�CDROM��
+ �ޥ���Ȥ���Ф褤�ΤǤ������㤨��CDROMʬΥ���ΥΡ��ȥѥ������
+ �����Ȥ������ʤɡ��ϡ��ɥǥ������˥ǡ����򥳥ԡ����ƻȤ�������
+ �פ������Τ�ޤ��󡣻��Τ�
+ �����ϡ��ɥǥ������˥��ԡ����뤳�ȡ��ޤ��ϰ��̤��줿����Ȥ��Ƥλ���
+ �˴ؤ������꤬���뤫�ɤ���������Ҥȴ��Ƚ�Ź�Ȥˤ��Ǥ����Ƥߤޤ���(ʿ
+ ��8ǯ6��20��)��
+");
+  ok( "<���ԥ����򲡤��Ʋ�����>" );
+  puts("
+  ����Ҥβ���(����03-3288-7777)
+ �ĿͤȤ��ƻ��Ѥ��뤫����ˤ����Ƥϡ��ϡ��ɥǥ������ؤΥ��ԡ����ޤ�
+ ���Υǡ��������̤���Ƥ��Ȥ��Ƥ���Ѥ����ɤ�����������LAN���
+ ʣ����ü���ǻ��Ѥ�����ϡ�����ü��������򿽹𤷤Ƥ���������
+ ü�������(CDROM����β��ʡݦ�)�����ʤ�ʧ������򤷤Ƥ���������
+");
+  ok( "<���ԥ����򲡤��Ʋ�����>" );
+  puts("
+ ���Ƚ�Ź��ŵ���β���  (����03-5210-4171)
+ CD-ROM�ɥ饤�֤����ɤ߽Ф��ƻ��Ѥ��뤳�Ȥ�����Ȥ��Ƥ��롣
+ �ϡ��ɥǥ������ؤΥ��ԡ����򤱤Ƥ�������������
+ LAN��Ǥλ��Ѥξ��ϡ����ӷ���򤷤Ƥ���������
+ �ϡ��ɥǥ������ؤΥ��ԡ�����Ĥ��Ƥ��롣������UNIX���
+ �����Х��եȤ˴ؤ��Ƥ��İ����Ƥ��ʤ���
+");
+  ok( "<���ԥ����򲡤��Ʋ�����>" );
+  puts("
+ dserver�ϡ�����¾�ˤ�OED�䡢�ʳص����Ѹ켭ŵ�ʤɡ������ơ��֥뤵��
+ �Ѱդ���ФۤȤ�ɤ�CDROM���ɤळ�Ȥ�����ޤ������ΤȤ���ʬ�Υ�������
+ �ǥ������˥ǡ����򥳥ԡ����ƻ��Ѥ����ɤ����ϡ��Ƽ��б����ۤʤ�ޤ���
+ �������������Ѥ�����Ϥޤ��饤���󥹤��ǧ������˻��Ѥ��뤳�Ȥ�
+ �����ᤷ�ޤ���
+ 
+ �Ȥ������ȤǤ��Τǡ��㤨�п����¡��±��漭ŵ�˴ؤ��ƤϸĿͤΥޥ����
+ �ϡ��ɥǥ������˥��ԡ����뤳�Ȥϲ�ǽ�Ǥ�����������˴ؤ��Ƥ�LAN�����
+ ��Фʤ��¤�ϡ��ɥǥ������ؤΥ��ԡ��򤵤���Τ��ɤ��褦�Ǥ���
+");
+  puts("------------------------------------------------------------------------
+�ʾ�
+");
+  switch( ok( "����򰵽̤��ƥϡ��ɥǥ������˥��ԡ����뤳�Ȥ�
+�饤���󥹾������Ϥ���ޤ����[y/n] " ) ) {
+  case 'y':
+  case 'Y':
+	puts( "\n���̤򳫻Ϥ��ޤ���\n" );
+	break;
+  default:
+	puts( "\n�饤���󥹾�����꤬����Τ����Ǥ��ޤ���\n" );
+	exit( -1 );
+	break;	
+  }
+}
+
 int	main(int argc, char *argv[])
 {
+  caution();
+
   if( argc < 3 ) {
-    fprintf( stderr, "%s soce_filename dest_filename\n", argv[ 0 ] );
+    fprintf( stderr, "Usage: %s soce_filename dest_filename\n", argv[ 0 ] );
     exit( -1 );
   }