Fix readline use.

7 files changed, 107 insertions, 1 deletions

diff --git a/net/yafc/distinfo b/net/yafc/distinfo
index 2e88585de04..c05bd8828d6 100644
--- a/net/yafc/distinfo
+++ b/net/yafc/distinfo
@@ -1,6 +1,12 @@
-$NetBSD: distinfo,v 1.4 2006/01/08 21:07:06 joerg Exp $
+$NetBSD: distinfo,v 1.5 2014/04/17 20:27:32 joerg Exp $
 
 SHA1 (yafc-0.7.10.tar.bz2) = a9a0cd2a86bb3e36b670c74fd348d68087cbe7b4
 RMD160 (yafc-0.7.10.tar.bz2) = f785bc4e9cfbef7d3aa35714726dce7a484e2eed
 Size (yafc-0.7.10.tar.bz2) = 403013 bytes
 SHA1 (patch-aa) = 91be0ade7cfb7fb72c452a6bd18c4dda353db71f
+SHA1 (patch-lib_bashline.c) = 8a709ffe7e12277d71db90c89962622d6f64acdd
+SHA1 (patch-lib_bashline.h) = 059e5c47ed016a8b42de4384322def540d93f525
+SHA1 (patch-src_completion.c) = 3a6a0ea80088e0ebe00a44e094ff1cfc5a44064c
+SHA1 (patch-src_completion.h) = 43a2431089fb3a0f11b60a2a244f08984a9f7200
+SHA1 (patch-src_help.c) = 52408af1d8c4e775f7b6ee18d6831d2d53e7d1eb
+SHA1 (patch-src_input.c) = ad7d0209ce7bc0f99962910b58714e11b85af618
diff --git a/net/yafc/patches/patch-lib_bashline.c b/net/yafc/patches/patch-lib_bashline.c
new file mode 100644
index 00000000000..a754eb9f981
--- /dev/null
+++ b/net/yafc/patches/patch-lib_bashline.c
@@ -0,0 +1,13 @@
+$NetBSD: patch-lib_bashline.c,v 1.1 2014/04/17 20:27:32 joerg Exp $
+
+--- lib/bashline.c.orig	2014-04-17 18:30:42.000000000 +0000
++++ lib/bashline.c
+@@ -41,7 +41,7 @@ static int completion_quoting_style = CO
+ /* A function to strip quotes that are not protected by backquotes.  It
+    allows single quotes to appear within double quotes, and vice versa.
+    It should be smarter. */
+-char *bash_dequote_filename (const char *text, int quote_char)
++char *bash_dequote_filename (char *text, int quote_char)
+ {
+ 	char *ret, *r;
+ 	const char *p;
diff --git a/net/yafc/patches/patch-lib_bashline.h b/net/yafc/patches/patch-lib_bashline.h
new file mode 100644
index 00000000000..210c37cfee2
--- /dev/null
+++ b/net/yafc/patches/patch-lib_bashline.h
@@ -0,0 +1,13 @@
+$NetBSD: patch-lib_bashline.h,v 1.1 2014/04/17 20:27:32 joerg Exp $
+
+--- lib/bashline.h.orig	2014-04-17 18:30:40.000000000 +0000
++++ lib/bashline.h
+@@ -15,7 +15,7 @@
+ #define _bashline_h_included
+ 
+ char *bash_quote_filename (char *s, int rtype, char *qcp);
+-char *bash_dequote_filename (const char *text, int quote_char);
++char *bash_dequote_filename (char *text, int quote_char);
+ char *bash_backslash_quote (char *string);
+ char *bash_single_quote (char *string);
+ char *bash_double_quote (char *string);
diff --git a/net/yafc/patches/patch-src_completion.c b/net/yafc/patches/patch-src_completion.c
new file mode 100644
index 00000000000..2ab79e6dda2
--- /dev/null
+++ b/net/yafc/patches/patch-src_completion.c
@@ -0,0 +1,13 @@
+$NetBSD: patch-src_completion.c,v 1.1 2014/04/17 20:27:33 joerg Exp $
+
+--- src/completion.c.orig	2014-04-17 18:24:23.000000000 +0000
++++ src/completion.c
+@@ -336,7 +336,7 @@ static char *local_taglist_completion_fu
+  * in case we want to do some simple parsing.  Return the array of matches,
+  * or NULL if there aren't any.
+  */
+-char **the_complete_function(char *text, int start, int end)
++char **the_complete_function(const char *text, int start, int end)
+ {
+     char **matches = 0;
+ 	cmd_t *cp;
diff --git a/net/yafc/patches/patch-src_completion.h b/net/yafc/patches/patch-src_completion.h
new file mode 100644
index 00000000000..0f4dddb2c4d
--- /dev/null
+++ b/net/yafc/patches/patch-src_completion.h
@@ -0,0 +1,14 @@
+$NetBSD: patch-src_completion.h,v 1.1 2014/04/17 20:27:33 joerg Exp $
+
+--- src/completion.h.orig	2001-12-11 11:21:52.000000000 +0000
++++ src/completion.h
+@@ -14,7 +14,7 @@
+ #ifndef _COMPLETION_H_INCLUDED
+ #define _COMPLETION_H_INCLUDED
+ 
+-char **the_complete_function(char *text, int start, int end);
+-char *no_completion_function(char *text, int state);
++char **the_complete_function(const char *text, int start, int end);
++char *no_completion_function(const char *text, int state);
+ 
+ #endif
diff --git a/net/yafc/patches/patch-src_help.c b/net/yafc/patches/patch-src_help.c
new file mode 100644
index 00000000000..5a064fa1694
--- /dev/null
+++ b/net/yafc/patches/patch-src_help.c
@@ -0,0 +1,22 @@
+$NetBSD: patch-src_help.c,v 1.1 2014/04/17 20:27:33 joerg Exp $
+
+--- src/help.c.orig	2001-12-11 11:21:52.000000000 +0000
++++ src/help.c
+@@ -22,7 +22,7 @@
+ void cmd_help(int argc, char **argv)
+ {
+ #ifdef HAVE_LIBREADLINE
+-	Function *func;
++	rl_command_func_t *func;
+ #endif
+ 	int i;
+ 	listitem *li;
+@@ -35,7 +35,7 @@ void cmd_help(int argc, char **argv)
+ 	rl_point=rl_end=0;
+ 	func = rl_named_function("possible-completions");
+ 	if(func)
+-		func();
++		func(0, 0);
+ 	else {
+ #endif
+ 		for(i=0; cmds[i].cmd; i++)
diff --git a/net/yafc/patches/patch-src_input.c b/net/yafc/patches/patch-src_input.c
new file mode 100644
index 00000000000..abb2cdde21b
--- /dev/null
+++ b/net/yafc/patches/patch-src_input.c
@@ -0,0 +1,25 @@
+$NetBSD: patch-src_input.c,v 1.1 2014/04/17 20:27:33 joerg Exp $
+
+--- src/input.c.orig	2002-02-15 11:09:09.000000000 +0000
++++ src/input.c
+@@ -200,9 +200,9 @@ void input_init(void)
+ 	rl_outstream = stderr;
+     /* Allow conditional parsing of the ~/.inputrc file. */
+     rl_readline_name = PACKAGE;
+-    rl_completion_entry_function = (rl_compentry_func_t *)no_completion_function;
++    rl_completion_entry_function = no_completion_function;
+     /* Tell the completer that we want a crack first. */
+-    rl_attempted_completion_function = (CPPFunction *)the_complete_function;
++    rl_attempted_completion_function = the_complete_function;
+ 
+ 	rl_completer_word_break_characters = " \t\n\"\';";
+ 	rl_completer_quote_characters = "'\"\\";
+@@ -210,7 +210,7 @@ void input_init(void)
+ 	/* characters that need to be quoted when appearing in filenames. */
+ 	rl_filename_quote_characters = " \t\n\\\"'@<>=;|&()#$`?*[]!:";
+ 	rl_filename_quoting_function = bash_quote_filename;
+-	rl_filename_dequoting_function = (rl_dequote_func_t *)bash_dequote_filename;
++	rl_filename_dequoting_function = bash_dequote_filename;
+ 	rl_char_is_quoted_p = char_is_quoted;
+ #endif
+