PageRenderTime 51ms CodeModel.GetById 19ms RepoModel.GetById 0ms app.codeStats 0ms

/dev-db/qdbm/files/qdbm-ruby19.diff

https://bitbucket.org/lmnd/gx86-cropped
diff | 363 lines | 335 code | 28 blank | 0 comment | 0 complexity | bfb28c60cce80effe48db3c618feffe2 MD5 | raw file
Possible License(s): LGPL-2.1, LGPL-2.0, GPL-3.0, GPL-2.0, LGPL-3.0, MIT, AGPL-3.0, CC-BY-SA-4.0, Apache-2.0, AGPL-1.0, Unlicense, BitTorrent-1.0, BSD-3-Clause, MPL-2.0-no-copyleft-exception, CC-BY-SA-3.0 
    

  1. --- qdbm-1.8.78.orig/ruby/Makefile.in
    2. 

  2. +++ qdbm-1.8.78/ruby/Makefile.in
    3. 

  3. @@ -85,27 +85,27 @@
    4. 

  4.  	sync ; sync
    5. 

  5.  	cd depot && rm -rf casket
    6. 

  6.  	cd depot && \
    7. 

  7. -	  $(RUNENV) ruby -w -Ilib rbdptest write casket 10000 1000
    8. 

  8. +	  $(RUNENV) ruby -w -Ilib -I. rbdptest write casket 10000 1000
    9. 

  9.  	cd depot && \
    10. 

  10. -	  $(RUNENV) ruby -w -Ilib rbdptest read casket
    11. 

  11. +	  $(RUNENV) ruby -w -Ilib -I. rbdptest read casket
    12. 

  12.  	cd depot && \
    13. 

  13. -	  $(RUNENV) ruby -w -Ilib rbdptest misc casket
    14. 

  14. +	  $(RUNENV) ruby -w -Ilib -I. rbdptest misc casket
    15. 

  15.  	cd depot && rm -rf casket
    16. 

  16.  	cd curia && rm -rf casket
    17. 

  17.  	cd curia && \
    18. 

  18. -	  $(RUNENV) ruby -w -Ilib rbcrtest write casket 10000 1000 10
    19. 

  19. +	  $(RUNENV) ruby -w -Ilib -I. rbcrtest write casket 10000 1000 10
    20. 

  20.  	cd curia && \
    21. 

  21. -	  $(RUNENV) ruby -w -Ilib rbcrtest read casket
    22. 

  22. +	  $(RUNENV) ruby -w -Ilib -I. rbcrtest read casket
    23. 

  23.  	cd curia && \
    24. 

  24. -	  $(RUNENV) ruby -w -Ilib rbcrtest misc casket
    25. 

  25. +	  $(RUNENV) ruby -w -Ilib -I. rbcrtest misc casket
    26. 

  26.  	cd curia && rm -rf casket
    27. 

  27.  	cd villa && rm -rf casket
    28. 

  28.  	cd villa && \
    29. 

  29. -	  $(RUNENV) ruby -w -Ilib rbvltest write casket 10000
    30. 

  30. +	  $(RUNENV) ruby -w -Ilib -I. rbvltest write casket 10000
    31. 

  31.  	cd villa && \
    32. 

  32. -	  $(RUNENV) ruby -w -Ilib rbvltest read casket
    33. 

  33. +	  $(RUNENV) ruby -w -Ilib -I. rbvltest read casket
    34. 

  34.  	cd villa && \
    35. 

  35. -	  $(RUNENV) ruby -w -Ilib rbvltest misc casket
    36. 

  36. +	  $(RUNENV) ruby -w -Ilib -I. rbvltest misc casket
    37. 

  37.  	cd villa && rm -rf casket
    38. 

  38.  	@printf '\n'
    39. 

  39.  	@printf '#================================================================\n'
    40. 

  40. --- qdbm-1.8.78.orig/ruby/curia/mod_curia.c
    41. 

  41. +++ qdbm-1.8.78/ruby/curia/mod_curia.c
    42. 

  42. @@ -24,6 +24,13 @@
    43. 

  43.  
    44. 

  44.  #define MAXOPEN 1024
    45. 

  45.  
    46. 

  46. +#ifndef StringValuePtr
    47. 

  47. +#  define StringValuePtr(v) STR2CSTR(v)
    48. 

  48. +#endif
    49. 

  49. +#ifndef RSTRING_LEN
    50. 

  50. +#  define RSTRING_LEN(s) (RSTRING(s)->len)
    51. 

  51. +#endif
    52. 

  52. +
    53. 

  53.  
    54. 

  54.  VALUE ccuriaerror;
    55. 

  55.  VALUE ccuriaerror_ENOERR;
    56. 

  56. @@ -233,7 +240,7 @@
    57. 

  57.    const char *name;
    58. 

  58.    int index, omode, bnum, dnum;
    59. 

  59.    if((index = getnewindex()) == -1) myerror(DP_EMISC);
    60. 

  60. -  name = STR2CSTR(vname);
    61. 

  61. +  name = StringValuePtr(vname);
    62. 

  62.    FIXNUM_P(vomode);
    63. 

  63.    omode = FIX2INT(vomode);
    64. 

  64.    FIXNUM_P(vbnum);
    65. 

  65. @@ -276,10 +283,10 @@
    66. 

  66.    int index, ksiz, vsiz, dmode;
    67. 

  67.    FIXNUM_P(vindex);
    68. 

  68.    if((index = FIX2INT(vindex)) == -1) myerror(DP_EMISC);
    69. 

  69. -  kbuf = STR2CSTR(vkey);
    70. 

  70. -  ksiz = RSTRING(vkey)->len;
    71. 

  71. -  vbuf = STR2CSTR(vval);
    72. 

  72. -  vsiz = RSTRING(vval)->len;
    73. 

  73. +  kbuf = StringValuePtr(vkey);
    74. 

  74. +  ksiz = RSTRING_LEN(vkey);
    75. 

  75. +  vbuf = StringValuePtr(vval);
    76. 

  76. +  vsiz = RSTRING_LEN(vval);
    77. 

  77.    FIXNUM_P(vdmode);
    78. 

  78.    dmode = FIX2INT(vdmode);
    79. 

  79.    curia = crtable[index];
    80. 

  80. @@ -297,8 +304,8 @@
    81. 

  81.    int index, ksiz;
    82. 

  82.    FIXNUM_P(vindex);
    83. 

  83.    if((index = FIX2INT(vindex)) == -1) myerror(DP_EMISC);
    84. 

  84. -  kbuf = STR2CSTR(vkey);
    85. 

  85. -  ksiz = RSTRING(vkey)->len;
    86. 

  86. +  kbuf = StringValuePtr(vkey);
    87. 

  87. +  ksiz = RSTRING_LEN(vkey);
    88. 

  88.    curia = crtable[index];
    89. 

  89.    if(!crout(curia, kbuf, ksiz)){
    90. 

  90.      if(crsltable[index] && dpecode == DP_ENOITEM) return Qfalse;
    91. 

  91. @@ -316,8 +323,8 @@
    92. 

  92.    VALUE vval;
    93. 

  93.    FIXNUM_P(vindex);
    94. 

  94.    if((index = FIX2INT(vindex)) == -1) myerror(DP_EMISC);
    95. 

  95. -  kbuf = STR2CSTR(vkey);
    96. 

  96. -  ksiz = RSTRING(vkey)->len;
    97. 

  97. +  kbuf = StringValuePtr(vkey);
    98. 

  98. +  ksiz = RSTRING_LEN(vkey);
    99. 

  99.    FIXNUM_P(vstart);
    100. 

  100.    start = FIX2INT(vstart);
    101. 

  101.    FIXNUM_P(vmax);
    102. 

  102. @@ -339,8 +346,8 @@
    103. 

  103.    int index, ksiz, vsiz;
    104. 

  104.    FIXNUM_P(vindex);
    105. 

  105.    if((index = FIX2INT(vindex)) == -1) myerror(DP_EMISC);
    106. 

  106. -  kbuf = STR2CSTR(vkey);
    107. 

  107. -  ksiz = RSTRING(vkey)->len;
    108. 

  108. +  kbuf = StringValuePtr(vkey);
    109. 

  109. +  ksiz = RSTRING_LEN(vkey);
    110. 

  110.    curia = crtable[index];
    111. 

  111.    if((vsiz = crvsiz(curia, kbuf, ksiz)) == -1){
    112. 

  112.      if(crsltable[index] && dpecode == DP_ENOITEM) return INT2FIX(-1);
    113. 

  113. --- qdbm-1.8.78.orig/ruby/curia/rbcrtest
    114. 

  114. +++ qdbm-1.8.78/ruby/curia/rbcrtest
    115. 

  115. @@ -21,7 +21,7 @@
    116. 

  116.  
    117. 

  117.  # main routine
    118. 

  118.  def main()
    119. 

  119. -  $0.gsub!(/.*\//, "")
    120. 

  120. +  $0 = $0.gsub(/.*\//, "")
    121. 

  121.    (ARGV.length >= 1) || usage()
    122. 

  122.    if(ARGV[0] == "write")
    123. 

  123.      rv = runwrite()
    124. 

  124. @@ -283,7 +283,7 @@
    125. 

  125.  
    126. 

  126.  
    127. 

  127.  # execute main
    128. 

  128. -$0.gsub!(/.*\//, "")
    129. 

  129. +$0 = $0.gsub(/.*\//, "")
    130. 

  130.  exit(main())
    131. 

  131.  
    132. 

  132.  
    133. 

  133. Only in qdbm-1.8.78/ruby/depot: mkmf.log
    134. 

  134. --- qdbm-1.8.78.orig/ruby/depot/mod_depot.c
    135. 

  135. +++ qdbm-1.8.78/ruby/depot/mod_depot.c
    136. 

  136. @@ -23,6 +23,13 @@
    137. 

  137.  
    138. 

  138.  #define MAXOPEN 1024
    139. 

  139.  
    140. 

  140. +#ifndef StringValuePtr
    141. 

  141. +#  define StringValuePtr(v) STR2CSTR(v)
    142. 

  142. +#endif
    143. 

  143. +#ifndef RSTRING_LEN
    144. 

  144. +#  define RSTRING_LEN(s) (RSTRING(s)->len)
    145. 

  145. +#endif
    146. 

  146. +
    147. 

  147.  
    148. 

  148.  VALUE cdepoterror;
    149. 

  149.  VALUE cdepoterror_ENOERR;
    150. 

  150. @@ -232,7 +239,7 @@
    151. 

  151.    const char *name;
    152. 

  152.    int index, omode, bnum;
    153. 

  153.    if((index = getnewindex()) == -1) myerror(DP_EMISC);
    154. 

  154. -  name = STR2CSTR(vname);
    155. 

  155. +  name = StringValuePtr(vname);
    156. 

  156.    FIXNUM_P(vomode);
    157. 

  157.    omode = FIX2INT(vomode);
    158. 

  158.    FIXNUM_P(vbnum);
    159. 

  159. @@ -273,10 +280,10 @@
    160. 

  160.    int index, ksiz, vsiz, dmode;
    161. 

  161.    FIXNUM_P(vindex);
    162. 

  162.    if((index = FIX2INT(vindex)) == -1) myerror(DP_EMISC);
    163. 

  163. -  kbuf = STR2CSTR(vkey);
    164. 

  164. -  ksiz = RSTRING(vkey)->len;
    165. 

  165. -  vbuf = STR2CSTR(vval);
    166. 

  166. -  vsiz = RSTRING(vval)->len;
    167. 

  167. +  kbuf = StringValuePtr(vkey);
    168. 

  168. +  ksiz = RSTRING_LEN(vkey);
    169. 

  169. +  vbuf = StringValuePtr(vval);
    170. 

  170. +  vsiz = RSTRING_LEN(vval);
    171. 

  171.    FIXNUM_P(vdmode);
    172. 

  172.    dmode = FIX2INT(vdmode);
    173. 

  173.    depot = dptable[index];
    174. 

  174. @@ -294,8 +301,8 @@
    175. 

  175.    int index, ksiz;
    176. 

  176.    FIXNUM_P(vindex);
    177. 

  177.    if((index = FIX2INT(vindex)) == -1) myerror(DP_EMISC);
    178. 

  178. -  kbuf = STR2CSTR(vkey);
    179. 

  179. -  ksiz = RSTRING(vkey)->len;
    180. 

  180. +  kbuf = StringValuePtr(vkey);
    181. 

  181. +  ksiz = RSTRING_LEN(vkey);
    182. 

  182.    depot = dptable[index];
    183. 

  183.    if(!dpout(depot, kbuf, ksiz)){
    184. 

  184.      if(dpsltable[index] && dpecode == DP_ENOITEM) return Qfalse;
    185. 

  185. @@ -313,8 +320,8 @@
    186. 

  186.    VALUE vval;
    187. 

  187.    FIXNUM_P(vindex);
    188. 

  188.    if((index = FIX2INT(vindex)) == -1) myerror(DP_EMISC);
    189. 

  189. -  kbuf = STR2CSTR(vkey);
    190. 

  190. -  ksiz = RSTRING(vkey)->len;
    191. 

  191. +  kbuf = StringValuePtr(vkey);
    192. 

  192. +  ksiz = RSTRING_LEN(vkey);
    193. 

  193.    FIXNUM_P(vstart);
    194. 

  194.    start = FIX2INT(vstart);
    195. 

  195.    FIXNUM_P(vmax);
    196. 

  196. @@ -336,8 +343,8 @@
    197. 

  197.    int index, ksiz, vsiz;
    198. 

  198.    FIXNUM_P(vindex);
    199. 

  199.    if((index = FIX2INT(vindex)) == -1) myerror(DP_EMISC);
    200. 

  200. -  kbuf = STR2CSTR(vkey);
    201. 

  201. -  ksiz = RSTRING(vkey)->len;
    202. 

  202. +  kbuf = StringValuePtr(vkey);
    203. 

  203. +  ksiz = RSTRING_LEN(vkey);
    204. 

  204.    depot = dptable[index];
    205. 

  205.    if((vsiz = dpvsiz(depot, kbuf, ksiz)) == -1){
    206. 

  206.      if(dpsltable[index] && dpecode == DP_ENOITEM) return INT2FIX(-1);
    207. 

  207. --- qdbm-1.8.78.orig/ruby/depot/rbdptest
    208. 

  208. +++ qdbm-1.8.78/ruby/depot/rbdptest
    209. 

  209. @@ -21,7 +21,7 @@
    210. 

  210.  
    211. 

  211.  # main routine
    212. 

  212.  def main()
    213. 

  213. -  $0.gsub!(/.*\//, "")
    214. 

  214. +  $0 = $0.gsub(/.*\//, "")
    215. 

  215.    (ARGV.length >= 1) || usage()
    216. 

  216.    if(ARGV[0] == "write")
    217. 

  217.      rv = runwrite()
    218. 

  218. @@ -278,7 +278,7 @@
    219. 

  219.  
    220. 

  220.  
    221. 

  221.  # execute main
    222. 

  222. -$0.gsub!(/.*\//, "")
    223. 

  223. +$0 = $0.gsub(/.*\//, "")
    224. 

  224.  exit(main())
    225. 

  225.  
    226. 

  226.  
    227. 

  227. --- qdbm-1.8.78.orig/ruby/myrbdoc
    228. 

  228. +++ qdbm-1.8.78/ruby/myrbdoc
    229. 

  229. @@ -186,7 +186,7 @@
    230. 

  230.  
    231. 

  231.  
    232. 

  232.  # execute main
    233. 

  233. -#$0.gsub!(/.*\//, "")
    234. 

  234. +#$0 = $0.gsub(/.*\//, "")
    235. 

  235.  exit(main())
    236. 

  236.  
    237. 

  237.  
    238. 

  238. --- qdbm-1.8.78.orig/ruby/villa/mod_villa.c
    239. 

  239. +++ qdbm-1.8.78/ruby/villa/mod_villa.c
    240. 

  240. @@ -25,6 +25,13 @@
    241. 

  241.  
    242. 

  242.  #define MAXOPEN 1024
    243. 

  243.  
    244. 

  244. +#ifndef StringValuePtr
    245. 

  245. +#  define StringValuePtr(v) STR2CSTR(v)
    246. 

  246. +#endif
    247. 

  247. +#ifndef RSTRING_LEN
    248. 

  248. +#  define RSTRING_LEN(s) (RSTRING(s)->len)
    249. 

  249. +#endif
    250. 

  250. +
    251. 

  251.  
    252. 

  252.  VALUE cvillaerror;
    253. 

  253.  VALUE cvillaerror_ENOERR;
    254. 

  254. @@ -304,7 +311,7 @@
    255. 

  255.    int index, omode, cmode;
    256. 

  256.    VLCFUNC cmp;
    257. 

  257.    if((index = getnewindex()) == -1) myerror(DP_EMISC);
    258. 

  258. -  name = STR2CSTR(vname);
    259. 

  259. +  name = StringValuePtr(vname);
    260. 

  260.    FIXNUM_P(vomode);
    261. 

  261.    omode = FIX2INT(vomode);
    262. 

  262.    FIXNUM_P(vcmode);
    263. 

  263. @@ -352,10 +359,10 @@
    264. 

  264.    int index, ksiz, vsiz, dmode;
    265. 

  265.    FIXNUM_P(vindex);
    266. 

  266.    if((index = FIX2INT(vindex)) == -1) myerror(DP_EMISC);
    267. 

  267. -  kbuf = STR2CSTR(vkey);
    268. 

  268. -  ksiz = RSTRING(vkey)->len;
    269. 

  269. -  vbuf = STR2CSTR(vval);
    270. 

  270. -  vsiz = RSTRING(vval)->len;
    271. 

  271. +  kbuf = StringValuePtr(vkey);
    272. 

  272. +  ksiz = RSTRING_LEN(vkey);
    273. 

  273. +  vbuf = StringValuePtr(vval);
    274. 

  274. +  vsiz = RSTRING_LEN(vval);
    275. 

  275.    FIXNUM_P(vdmode);
    276. 

  276.    dmode = FIX2INT(vdmode);
    277. 

  277.    villa = vltable[index];
    278. 

  278. @@ -373,8 +380,8 @@
    279. 

  279.    int index, ksiz;
    280. 

  280.    FIXNUM_P(vindex);
    281. 

  281.    if((index = FIX2INT(vindex)) == -1) myerror(DP_EMISC);
    282. 

  282. -  kbuf = STR2CSTR(vkey);
    283. 

  283. -  ksiz = RSTRING(vkey)->len;
    284. 

  284. +  kbuf = StringValuePtr(vkey);
    285. 

  285. +  ksiz = RSTRING_LEN(vkey);
    286. 

  286.    villa = vltable[index];
    287. 

  287.    if(!vlout(villa, kbuf, ksiz)){
    288. 

  288.      if(vlsltable[index] && dpecode == DP_ENOITEM) return Qfalse;
    289. 

  289. @@ -391,8 +398,8 @@
    290. 

  290.    VALUE vval;
    291. 

  291.    FIXNUM_P(vindex);
    292. 

  292.    if((index = FIX2INT(vindex)) == -1) myerror(DP_EMISC);
    293. 

  293. -  kbuf = STR2CSTR(vkey);
    294. 

  294. -  ksiz = RSTRING(vkey)->len;
    295. 

  295. +  kbuf = StringValuePtr(vkey);
    296. 

  296. +  ksiz = RSTRING_LEN(vkey);
    297. 

  297.    villa = vltable[index];
    298. 

  298.    if(!(vbuf = vlget(villa, kbuf, ksiz, &vsiz))){
    299. 

  299.      if(vlsltable[index] && dpecode == DP_ENOITEM) return Qnil;
    300. 

  300. @@ -409,8 +416,8 @@
    301. 

  301.    int index, ksiz, vsiz;
    302. 

  302.    FIXNUM_P(vindex);
    303. 

  303.    if((index = FIX2INT(vindex)) == -1) myerror(DP_EMISC);
    304. 

  304. -  kbuf = STR2CSTR(vkey);
    305. 

  305. -  ksiz = RSTRING(vkey)->len;
    306. 

  306. +  kbuf = StringValuePtr(vkey);
    307. 

  307. +  ksiz = RSTRING_LEN(vkey);
    308. 

  308.    villa = vltable[index];
    309. 

  309.    if((vsiz = vlvsiz(villa, kbuf, ksiz)) == -1){
    310. 

  310.      if(vlsltable[index] && dpecode == DP_ENOITEM) return INT2FIX(-1);
    311. 

  311. @@ -426,8 +433,8 @@
    312. 

  312.    int index, ksiz, vnum;
    313. 

  313.    FIXNUM_P(vindex);
    314. 

  314.    if((index = FIX2INT(vindex)) == -1) myerror(DP_EMISC);
    315. 

  315. -  kbuf = STR2CSTR(vkey);
    316. 

  316. -  ksiz = RSTRING(vkey)->len;
    317. 

  317. +  kbuf = StringValuePtr(vkey);
    318. 

  318. +  ksiz = RSTRING_LEN(vkey);
    319. 

  319.    villa = vltable[index];
    320. 

  320.    vnum = vlvnum(villa, kbuf, ksiz);
    321. 

  321.    return INT2FIX(vnum);
    322. 

  322. @@ -497,8 +504,8 @@
    323. 

  323.    VALUE vval;
    324. 

  324.    FIXNUM_P(vindex);
    325. 

  325.    if((index = FIX2INT(vindex)) == -1) myerror(DP_EMISC);
    326. 

  326. -  kbuf = STR2CSTR(vkey);
    327. 

  327. -  ksiz = RSTRING(vkey)->len;
    328. 

  328. +  kbuf = StringValuePtr(vkey);
    329. 

  329. +  ksiz = RSTRING_LEN(vkey);
    330. 

  330.    FIXNUM_P(vjmode);
    331. 

  331.    jmode = FIX2INT(vjmode);
    332. 

  332.    villa = vltable[index];
    333. 

  333. @@ -551,8 +558,8 @@
    334. 

  334.    int index, vsiz, cpmode;
    335. 

  335.    FIXNUM_P(vindex);
    336. 

  336.    if((index = FIX2INT(vindex)) == -1) myerror(DP_EMISC);
    337. 

  337. -  vbuf = STR2CSTR(vval);
    338. 

  338. -  vsiz = RSTRING(vval)->len;
    339. 

  339. +  vbuf = StringValuePtr(vval);
    340. 

  340. +  vsiz = RSTRING_LEN(vval);
    341. 

  341.    FIXNUM_P(vcpmode);
    342. 

  342.    cpmode = FIX2INT(vcpmode);
    343. 

  343.    villa = vltable[index];
    344. 

  344. --- qdbm-1.8.78.orig/ruby/villa/rbvltest
    345. 

  345. +++ qdbm-1.8.78/ruby/villa/rbvltest
    346. 

  346. @@ -21,7 +21,7 @@
    347. 

  347.  
    348. 

  348.  # main routine
    349. 

  349.  def main()
    350. 

  350. -  $0.gsub!(/.*\//, "")
    351. 

  351. +  $0 = $0.gsub(/.*\//, "")
    352. 

  352.    (ARGV.length >= 1) || usage()
    353. 

  353.    if(ARGV[0] == "write")
    354. 

  354.      rv = runwrite()
    355. 

  355. @@ -280,7 +280,7 @@
    356. 

  356.  
    357. 

  357.  
    358. 

  358.  # execute main
    359. 

  359. -$0.gsub!(/.*\//, "")
    360. 

  360. +$0 = $0.gsub(/.*\//, "")
    361. 

  361.  exit(main())
    362. 

  362.  
    363. 

  363.  
    364. 

  364.