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
|
Description: wraps some api call to use with ruby1.9 as well as ruby1.8
Origin: vendor
Author: KURASHIKI Satoru <lurdan@gmail.com>
Lucas Nussbaum <lucas@lucas-nussbaum.net>
Index: qdbm/ruby/depot/mod_depot.c
===================================================================
--- qdbm.orig/ruby/depot/mod_depot.c 2010-08-12 20:39:10.627245535 +0900
+++ qdbm/ruby/depot/mod_depot.c 2010-08-12 20:42:58.951245088 +0900
@@ -23,6 +23,11 @@
#define MAXOPEN 1024
+#ifndef RUBY_19
+#ifndef RSTRING_LEN
+#define RSTRING_LEN(v) (RSTRING(v)->len)
+#endif
+#endif
VALUE cdepoterror;
VALUE cdepoterror_ENOERR;
@@ -232,7 +237,7 @@
const char *name;
int index, omode, bnum;
if((index = getnewindex()) == -1) myerror(DP_EMISC);
- name = STR2CSTR(vname);
+ name = StringValuePtr(vname);
FIXNUM_P(vomode);
omode = FIX2INT(vomode);
FIXNUM_P(vbnum);
@@ -273,10 +278,10 @@
int index, ksiz, vsiz, dmode;
FIXNUM_P(vindex);
if((index = FIX2INT(vindex)) == -1) myerror(DP_EMISC);
- kbuf = STR2CSTR(vkey);
- ksiz = RSTRING(vkey)->len;
- vbuf = STR2CSTR(vval);
- vsiz = RSTRING(vval)->len;
+ kbuf = StringValuePtr(vkey);
+ ksiz = RSTRING_LEN(vkey);
+ vbuf = StringValuePtr(vval);
+ vsiz = RSTRING_LEN(vval);
FIXNUM_P(vdmode);
dmode = FIX2INT(vdmode);
depot = dptable[index];
@@ -294,8 +299,8 @@
int index, ksiz;
FIXNUM_P(vindex);
if((index = FIX2INT(vindex)) == -1) myerror(DP_EMISC);
- kbuf = STR2CSTR(vkey);
- ksiz = RSTRING(vkey)->len;
+ kbuf = StringValuePtr(vkey);
+ ksiz = RSTRING_LEN(vkey);
depot = dptable[index];
if(!dpout(depot, kbuf, ksiz)){
if(dpsltable[index] && dpecode == DP_ENOITEM) return Qfalse;
@@ -313,8 +318,8 @@
VALUE vval;
FIXNUM_P(vindex);
if((index = FIX2INT(vindex)) == -1) myerror(DP_EMISC);
- kbuf = STR2CSTR(vkey);
- ksiz = RSTRING(vkey)->len;
+ kbuf = StringValuePtr(vkey);
+ ksiz = RSTRING_LEN(vkey);
FIXNUM_P(vstart);
start = FIX2INT(vstart);
FIXNUM_P(vmax);
@@ -336,8 +341,8 @@
int index, ksiz, vsiz;
FIXNUM_P(vindex);
if((index = FIX2INT(vindex)) == -1) myerror(DP_EMISC);
- kbuf = STR2CSTR(vkey);
- ksiz = RSTRING(vkey)->len;
+ kbuf = StringValuePtr(vkey);
+ ksiz = RSTRING_LEN(vkey);
depot = dptable[index];
if((vsiz = dpvsiz(depot, kbuf, ksiz)) == -1){
if(dpsltable[index] && dpecode == DP_ENOITEM) return INT2FIX(-1);
Index: qdbm/ruby/curia/mod_curia.c
===================================================================
--- qdbm.orig/ruby/curia/mod_curia.c 2010-08-12 20:39:31.855253284 +0900
+++ qdbm/ruby/curia/mod_curia.c 2010-08-12 20:42:40.351244536 +0900
@@ -24,6 +24,11 @@
#define MAXOPEN 1024
+#ifndef RUBY_19
+#ifndef RSTRING_LEN
+#define RSTRING_LEN(v) (RSTRING(v)->len)
+#endif
+#endif
VALUE ccuriaerror;
VALUE ccuriaerror_ENOERR;
@@ -233,7 +238,7 @@
const char *name;
int index, omode, bnum, dnum;
if((index = getnewindex()) == -1) myerror(DP_EMISC);
- name = STR2CSTR(vname);
+ name = StringValuePtr(vname);
FIXNUM_P(vomode);
omode = FIX2INT(vomode);
FIXNUM_P(vbnum);
@@ -276,10 +281,10 @@
int index, ksiz, vsiz, dmode;
FIXNUM_P(vindex);
if((index = FIX2INT(vindex)) == -1) myerror(DP_EMISC);
- kbuf = STR2CSTR(vkey);
- ksiz = RSTRING(vkey)->len;
- vbuf = STR2CSTR(vval);
- vsiz = RSTRING(vval)->len;
+ kbuf = StringValuePtr(vkey);
+ ksiz = RSTRING_LEN(vkey);
+ vbuf = StringValuePtr(vval);
+ vsiz = RSTRING_LEN(vval);
FIXNUM_P(vdmode);
dmode = FIX2INT(vdmode);
curia = crtable[index];
@@ -297,8 +302,8 @@
int index, ksiz;
FIXNUM_P(vindex);
if((index = FIX2INT(vindex)) == -1) myerror(DP_EMISC);
- kbuf = STR2CSTR(vkey);
- ksiz = RSTRING(vkey)->len;
+ kbuf = StringValuePtr(vkey);
+ ksiz = RSTRING_LEN(vkey);
curia = crtable[index];
if(!crout(curia, kbuf, ksiz)){
if(crsltable[index] && dpecode == DP_ENOITEM) return Qfalse;
@@ -316,8 +321,8 @@
VALUE vval;
FIXNUM_P(vindex);
if((index = FIX2INT(vindex)) == -1) myerror(DP_EMISC);
- kbuf = STR2CSTR(vkey);
- ksiz = RSTRING(vkey)->len;
+ kbuf = StringValuePtr(vkey);
+ ksiz = RSTRING_LEN(vkey);
FIXNUM_P(vstart);
start = FIX2INT(vstart);
FIXNUM_P(vmax);
@@ -339,8 +344,8 @@
int index, ksiz, vsiz;
FIXNUM_P(vindex);
if((index = FIX2INT(vindex)) == -1) myerror(DP_EMISC);
- kbuf = STR2CSTR(vkey);
- ksiz = RSTRING(vkey)->len;
+ kbuf = StringValuePtr(vkey);
+ ksiz = RSTRING_LEN(vkey);
curia = crtable[index];
if((vsiz = crvsiz(curia, kbuf, ksiz)) == -1){
if(crsltable[index] && dpecode == DP_ENOITEM) return INT2FIX(-1);
Index: qdbm/ruby/villa/mod_villa.c
===================================================================
--- qdbm.orig/ruby/villa/mod_villa.c 2010-08-12 20:39:40.855248815 +0900
+++ qdbm/ruby/villa/mod_villa.c 2010-08-12 20:43:25.211242671 +0900
@@ -25,6 +25,11 @@
#define MAXOPEN 1024
+#ifndef RUBY_19
+#ifndef RSTRING_LEN
+#define RSTRING_LEN(v) (RSTRING(v)->len)
+#endif
+#endif
VALUE cvillaerror;
VALUE cvillaerror_ENOERR;
@@ -304,7 +309,7 @@
int index, omode, cmode;
VLCFUNC cmp;
if((index = getnewindex()) == -1) myerror(DP_EMISC);
- name = STR2CSTR(vname);
+ name = StringValuePtr(vname);
FIXNUM_P(vomode);
omode = FIX2INT(vomode);
FIXNUM_P(vcmode);
@@ -352,10 +357,10 @@
int index, ksiz, vsiz, dmode;
FIXNUM_P(vindex);
if((index = FIX2INT(vindex)) == -1) myerror(DP_EMISC);
- kbuf = STR2CSTR(vkey);
- ksiz = RSTRING(vkey)->len;
- vbuf = STR2CSTR(vval);
- vsiz = RSTRING(vval)->len;
+ kbuf = StringValuePtr(vkey);
+ ksiz = RSTRING_LEN(vkey);
+ vbuf = StringValuePtr(vval);
+ vsiz = RSTRING_LEN(vval);
FIXNUM_P(vdmode);
dmode = FIX2INT(vdmode);
villa = vltable[index];
@@ -373,8 +378,8 @@
int index, ksiz;
FIXNUM_P(vindex);
if((index = FIX2INT(vindex)) == -1) myerror(DP_EMISC);
- kbuf = STR2CSTR(vkey);
- ksiz = RSTRING(vkey)->len;
+ kbuf = StringValuePtr(vkey);
+ ksiz = RSTRING_LEN(vkey);
villa = vltable[index];
if(!vlout(villa, kbuf, ksiz)){
if(vlsltable[index] && dpecode == DP_ENOITEM) return Qfalse;
@@ -391,8 +396,8 @@
VALUE vval;
FIXNUM_P(vindex);
if((index = FIX2INT(vindex)) == -1) myerror(DP_EMISC);
- kbuf = STR2CSTR(vkey);
- ksiz = RSTRING(vkey)->len;
+ kbuf = StringValuePtr(vkey);
+ ksiz = RSTRING_LEN(vkey);
villa = vltable[index];
if(!(vbuf = vlget(villa, kbuf, ksiz, &vsiz))){
if(vlsltable[index] && dpecode == DP_ENOITEM) return Qnil;
@@ -409,8 +414,8 @@
int index, ksiz, vsiz;
FIXNUM_P(vindex);
if((index = FIX2INT(vindex)) == -1) myerror(DP_EMISC);
- kbuf = STR2CSTR(vkey);
- ksiz = RSTRING(vkey)->len;
+ kbuf = StringValuePtr(vkey);
+ ksiz = RSTRING_LEN(vkey);
villa = vltable[index];
if((vsiz = vlvsiz(villa, kbuf, ksiz)) == -1){
if(vlsltable[index] && dpecode == DP_ENOITEM) return INT2FIX(-1);
@@ -426,8 +431,8 @@
int index, ksiz, vnum;
FIXNUM_P(vindex);
if((index = FIX2INT(vindex)) == -1) myerror(DP_EMISC);
- kbuf = STR2CSTR(vkey);
- ksiz = RSTRING(vkey)->len;
+ kbuf = StringValuePtr(vkey);
+ ksiz = RSTRING_LEN(vkey);
villa = vltable[index];
vnum = vlvnum(villa, kbuf, ksiz);
return INT2FIX(vnum);
@@ -497,8 +502,8 @@
VALUE vval;
FIXNUM_P(vindex);
if((index = FIX2INT(vindex)) == -1) myerror(DP_EMISC);
- kbuf = STR2CSTR(vkey);
- ksiz = RSTRING(vkey)->len;
+ kbuf = StringValuePtr(vkey);
+ ksiz = RSTRING_LEN(vkey);
FIXNUM_P(vjmode);
jmode = FIX2INT(vjmode);
villa = vltable[index];
@@ -551,8 +556,8 @@
int index, vsiz, cpmode;
FIXNUM_P(vindex);
if((index = FIX2INT(vindex)) == -1) myerror(DP_EMISC);
- vbuf = STR2CSTR(vval);
- vsiz = RSTRING(vval)->len;
+ vbuf = StringValuePtr(vval);
+ vsiz = RSTRING_LEN(vval);
FIXNUM_P(vcpmode);
cpmode = FIX2INT(vcpmode);
villa = vltable[index];
Index: qdbm/ruby/Makefile.in
===================================================================
--- qdbm.orig/ruby/Makefile.in 2010-08-12 20:39:49.311247278 +0900
+++ qdbm/ruby/Makefile.in 2010-08-12 21:11:54.143244081 +0900
@@ -28,16 +28,15 @@
RUNENV = LD_LIBRARY_PATH=.:..:../..:/usr/local/lib
-
#================================================================
# Actions
#================================================================
all :
- cd depot && [ -f Makefile ] || $(RUNENV) ruby extconf.rb ; $(RUNENV) make
- cd curia && [ -f Makefile ] || $(RUNENV) ruby extconf.rb ; $(RUNENV) make
- cd villa && [ -f Makefile ] || $(RUNENV) ruby extconf.rb ; $(RUNENV) make
+ cd depot && [ -f Makefile ] || $(RUNENV) $(RUBY) extconf.rb ; $(RUNENV) make
+ cd curia && [ -f Makefile ] || $(RUNENV) $(RUBY) extconf.rb ; $(RUNENV) make
+ cd villa && [ -f Makefile ] || $(RUNENV) $(RUBY) extconf.rb ; $(RUNENV) make
@printf '\n'
@printf '#================================================================\n'
@printf '# Ready to install.\n'
@@ -69,7 +68,7 @@
uninstall :
- pprefix=`ruby -e '$$:.each() do |path| ; printf("%s\n", path) ; end' | grep -v '^\.'` ; \
+ pprefix=`$(RUBY) -e '$$:.each() do |path| ; printf("%s\n", path) ; end' | grep -v '^\.'` ; \
find $$pprefix -print | sort | uniq | \
egrep '(mod_depot\.so|depot\.rb|mod_curia\.so|curia\.rb|mod_villa\.so|villa\.rb)' | \
xargs rm -f
@@ -85,27 +84,27 @@
sync ; sync
cd depot && rm -rf casket
cd depot && \
- $(RUNENV) ruby -w -Ilib rbdptest write casket 10000 1000
+ $(RUNENV) $(RUBY) -w -Ilib -I. rbdptest write casket 10000 1000
cd depot && \
- $(RUNENV) ruby -w -Ilib rbdptest read casket
+ $(RUNENV) $(RUBY) -w -Ilib -I. rbdptest read casket
cd depot && \
- $(RUNENV) ruby -w -Ilib rbdptest misc casket
+ $(RUNENV) $(RUBY) -w -Ilib -I. rbdptest misc casket
cd depot && rm -rf casket
cd curia && rm -rf casket
cd curia && \
- $(RUNENV) ruby -w -Ilib rbcrtest write casket 10000 1000 10
+ $(RUNENV) $(RUBY) -w -Ilib -I. rbcrtest write casket 10000 1000 10
cd curia && \
- $(RUNENV) ruby -w -Ilib rbcrtest read casket
+ $(RUNENV) $(RUBY) -w -Ilib -I. rbcrtest read casket
cd curia && \
- $(RUNENV) ruby -w -Ilib rbcrtest misc casket
+ $(RUNENV) $(RUBY) -w -Ilib -I. rbcrtest misc casket
cd curia && rm -rf casket
cd villa && rm -rf casket
cd villa && \
- $(RUNENV) ruby -w -Ilib rbvltest write casket 10000
+ $(RUNENV) $(RUBY) -w -Ilib -I. rbvltest write casket 10000
cd villa && \
- $(RUNENV) ruby -w -Ilib rbvltest read casket
+ $(RUNENV) $(RUBY) -w -Ilib -I. rbvltest read casket
cd villa && \
- $(RUNENV) ruby -w -Ilib rbvltest misc casket
+ $(RUNENV) $(RUBY) -w -Ilib -I. rbvltest misc casket
cd villa && rm -rf casket
@printf '\n'
@printf '#================================================================\n'
Index: qdbm/ruby/curia/rbcrtest
===================================================================
--- qdbm.orig/ruby/curia/rbcrtest 2010-08-12 20:48:17.871249729 +0900
+++ qdbm/ruby/curia/rbcrtest 2010-08-12 20:48:33.739252026 +0900
@@ -21,7 +21,7 @@
# main routine
def main()
- $0.gsub!(/.*\//, "")
+ $0 = $0.gsub(/.*\//, "")
(ARGV.length >= 1) || usage()
if(ARGV[0] == "write")
rv = runwrite()
@@ -283,7 +283,7 @@
# execute main
-$0.gsub!(/.*\//, "")
+$0 = $0.gsub(/.*\//, "")
exit(main())
Index: qdbm/ruby/depot/rbdptest
===================================================================
--- qdbm.orig/ruby/depot/rbdptest 2010-08-12 20:48:47.999242043 +0900
+++ qdbm/ruby/depot/rbdptest 2010-08-12 20:48:57.379246136 +0900
@@ -21,7 +21,7 @@
# main routine
def main()
- $0.gsub!(/.*\//, "")
+ $0 = $0.gsub(/.*\//, "")
(ARGV.length >= 1) || usage()
if(ARGV[0] == "write")
rv = runwrite()
@@ -278,7 +278,7 @@
# execute main
-$0.gsub!(/.*\//, "")
+$0 = $0.gsub(/.*\//, "")
exit(main())
Index: qdbm/ruby/villa/rbvltest
===================================================================
--- qdbm.orig/ruby/villa/rbvltest 2010-08-12 20:49:13.847254224 +0900
+++ qdbm/ruby/villa/rbvltest 2010-08-12 20:49:20.167246365 +0900
@@ -21,7 +21,7 @@
# main routine
def main()
- $0.gsub!(/.*\//, "")
+ $0 = $0.gsub(/.*\//, "")
(ARGV.length >= 1) || usage()
if(ARGV[0] == "write")
rv = runwrite()
@@ -280,7 +280,7 @@
# execute main
-$0.gsub!(/.*\//, "")
+$0 = $0.gsub(/.*\//, "")
exit(main())
|
