[ruby-dev:4061] [patch] readline

前田です。

readline.cへのパッチです。
この間のパッチをあてた後でこのパッチをあててください。


--- ext/readline/readline.c.orig	Wed Jan  6 13:02:35 1999
+++ ext/readline/readline.c	Wed Jan  6 13:04:07 1999
@@ -284,38 +284,50 @@
 static VALUE
 filename_completion_proc_call(VALUE self, VALUE str)
 {
-    VALUE result = rb_ary_new();
+    VALUE result;
     char **matches;
     int i;
 
     matches = completion_matches(STR2CSTR(str),
 				 filename_completion_function);
-    for (i = 0; matches[i]; i++) {
-	rb_ary_push(result, rb_str_new2(matches[i]));
-	free(matches[i]);
+    if (matches) {
+	result = rb_ary_new();
+	for (i = 0; matches[i]; i++) {
+	    rb_ary_push(result, rb_str_new2(matches[i]));
+	    free(matches[i]);
+	}
+	free(matches);
+	if (RARRAY(result)->len >= 2)
+	    rb_ary_shift(result);
+    }
+    else {
+	result = Qnil;
     }
-    free(matches);
-    if (RARRAY(result)->len >= 2)
-	rb_ary_shift(result);
     return result;
 }
 
 static VALUE
 username_completion_proc_call(VALUE self, VALUE str)
 {
-    VALUE result = rb_ary_new();
+    VALUE result;
     char **matches;
     int i;
 
     matches = completion_matches(STR2CSTR(str),
 				 username_completion_function);
-    for (i = 0; matches[i]; i++) {
-	rb_ary_push(result, rb_str_new2(matches[i]));
-	free(matches[i]);
+    if (matches) {
+	result = rb_ary_new();
+	for (i = 0; matches[i]; i++) {
+	    rb_ary_push(result, rb_str_new2(matches[i]));
+	    free(matches[i]);
+	}
+	free(matches);
+	if (RARRAY(result)->len >= 2)
+	    rb_ary_shift(result);
+    }
+    else {
+	result = Qnil;
     }
-    free(matches);
-    if (RARRAY(result)->len >= 2)
-	rb_ary_shift(result);
     return result;
 }
 

--
前田 修吾