kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix build with Ruby 1.8.

Browse source 
Reported and test by:	Gen Otsuji <gen_otsuji@yahoo.co.jp>
This commit is contained in:
Akinori MUSHA 2004-06-24 16:12:01 +00:00
parent 4cf32c89e7
commit 99f5a370b1
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=112148
1 changed files with 113 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

113
textproc/ruby-sary/files/patch-searcher.c Normal file
View file

@ -0,0 +1,113 @@
--- searcher.c.orig Wed Sep 17 17:49:46 2003
+++ searcher.c Thu Jun 24 11:46:14 2004
@@ -27,6 +27,7 @@
#include <errno.h>
#include "sary.h"
#include "ruby.h"
+#include "version.h"
#define GET_Searcher(obj, dat) Data_Get_Struct(obj, SarySearcher, dat)
@@ -76,14 +77,24 @@
rb_scan_args(argc, argv, "11", &file_name, &array_name);
+#if RUBY_VERSION_CODE < 180
Check_SafeStr(file_name);
file_name_ptr = STR2CSTR(file_name);
+#else
+ SafeStringValue(file_name);
+ file_name_ptr = RSTRING(file_name)->ptr;
+#endif
if (array_name == Qnil)
searcher = sary_searcher_new(file_name_ptr);
else {
+#if RUBY_VERSION_CODE < 180
Check_SafeStr(array_name);
array_name_ptr = STR2CSTR(array_name);
+#else
+ SafeStringValue(array_name);
+ array_name_ptr = RSTRING(array_name)->ptr;
+#endif
searcher = sary_searcher_new2(file_name_ptr, array_name_ptr);
}
if (searcher == NULL)
@@ -118,8 +129,14 @@
GET_Searcher(klass, searcher);
+#if RUBY_VERSION_CODE < 180
Check_SafeStr(pattern);
pat = str2cstr(pattern, &len);
+#else
+ SafeStringValue(pattern);
+ pat = RSTRING(pattern)->ptr;
+ len = RSTRING(pattern)->len;
+#endif
if (sary_searcher_search2(searcher, pat, len))
return Qtrue;
@@ -145,8 +162,13 @@
pat = ALLOCA_N(char*, len);
for (i = 0; i < len; i++) {
pattern = rb_ary_entry(pattern_array, (long)i);
+#if RUBY_VERSION_CODE < 180
Check_SafeStr(pattern);
pat[i] = STR2CSTR(pattern);
+#else
+ SafeStringValue(pattern);
+ pat[i] = RSTRING(pattern)->ptr;
+#endif
}
if (sary_searcher_multi_search(searcher, pat, len))
@@ -164,8 +186,13 @@
GET_Searcher(klass, searcher);
+#if RUBY_VERSION_CODE < 180
Check_SafeStr(pattern);
pat = STR2CSTR(pattern);
+#else
+ SafeStringValue(pattern);
+ pat = RSTRING(pattern)->ptr;
+#endif
if (sary_searcher_isearch(searcher, pat, NUM2INT(len)))
return Qtrue;
@@ -194,8 +221,14 @@
GET_Searcher(klass, searcher);
+#if RUBY_VERSION_CODE < 180
Check_SafeStr(pattern);
pat = str2cstr(pattern, &len);
+#else
+ SafeStringValue(pattern);
+ pat = RSTRING(pattern)->ptr;
+ len = RSTRING(pattern)->len;
+#endif
if (sary_searcher_icase_search2(searcher, pat, len))
return Qtrue;
@@ -239,10 +272,19 @@
if (sary_searcher_count_occurrences(searcher) == 0)
return Qnil;
+#if RUBY_VERSION_CODE < 180
Check_SafeStr(start_tag);
Check_SafeStr(end_tag);
stag = rb_str2cstr(start_tag, &slen);
etag = rb_str2cstr(end_tag, &elen);
+#else
+ SafeStringValue(start_tag);
+ SafeStringValue(end_tag);
+ stag = RSTRING(start_tag)->ptr;
+ slen = RSTRING(start_tag)->len;
+ etag = RSTRING(end_tag)->ptr;
+ elen = RSTRING(end_tag)->len;
+#endif
region = sary_searcher_get_next_tagged_region2(searcher, stag, slen,
etag, elen, &rlen);