bk commit into 5.0 tree (joerg:1.2392) BUG#23293

[Joerg Bruehe]

Below is the list of changes that have just been committed into a local
5.0 repository of joerg. When joerg does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-01-31 15:25:56+01:00, joerg@trift2. +3 -0
  Fix bug#23293 "readline detection broken on NetBSD":
  
  Its root cause is a difference between the "readline" and "libedit" (header files)
  definitions of "rl_completion_entry_function", where the "libedit" one is wrong anyway:
  This variable is used as a pointer to a function returning "char *",
  but "libedit" declares it as returning "int" and then adds casts on usage.
  
  Change it to "CPFunction *" and get rid of the casts.

  client/mysql.cc@stripped, 2007-01-31 15:25:53+01:00, joerg@trift2. +3 -3
    Fix bug#23293 "readline detection broken on NetBSD":
    
    Now that the "libedit" header files declares "rl_completion_entry_function" correctly,
    it need not be cast on usage, and "no_completion()" can be declared to return "char
*".

  cmd-line-utils/libedit/readline.c@stripped, 2007-01-31 15:25:53+01:00, joerg@trift2. +5 -6
    Fix bug#23293 "readline detection broken on NetBSD":
    
    Now that the "libedit" header files declares "rl_completion_entry_function" correctly,
    it need not be cast on usage, and "complet_func()" is a "CPFunction *" as well.

  cmd-line-utils/libedit/readline/readline.h@stripped, 2007-01-31 15:25:53+01:00, joerg@trift2.
+1 -1
    Fix bug#23293 "readline detection broken on NetBSD":
    
    Declare "rl_completion_entry_function()" to be a "CPFunction *", this avoids casts
    and brings "libedit" in sync with "readline".

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	joerg
# Host:	trift2.
# Root:	/MySQL/M50/bug23293-5.0

--- 1.230/client/mysql.cc	2006-12-23 20:04:04 +01:00
+++ 1.231/client/mysql.cc	2007-01-31 15:25:53 +01:00
@@ -1420,7 +1420,7 @@
 #if defined(USE_NEW_READLINE_INTERFACE) || defined(USE_LIBEDIT_INTERFACE)
 char *no_completion(const char*,int)
 #else
-int no_completion()
+char *no_completion()
 #endif
 {
   return 0;					/* No filename completion */
@@ -1508,10 +1508,10 @@
   setlocale(LC_ALL,""); /* so as libedit use isprint */
 #endif
   rl_attempted_completion_function= (CPPFunction*)&new_mysql_completion;
-  rl_completion_entry_function= (Function*)&no_completion;
+  rl_completion_entry_function= &no_completion;
 #else
   rl_attempted_completion_function= (CPPFunction*)&new_mysql_completion;
-  rl_completion_entry_function= (Function*)&no_completion;
+  rl_completion_entry_function= &no_completion;
 #endif
 }
 

--- 1.3/cmd-line-utils/libedit/readline/readline.h	2005-05-13 11:58:35 +02:00
+++ 1.4/cmd-line-utils/libedit/readline/readline.h	2007-01-31 15:25:53 +01:00
@@ -102,7 +102,7 @@
 extern char		*rl_basic_word_break_characters;
 extern char		*rl_completer_word_break_characters;
 extern char		*rl_completer_quote_characters;
-extern Function		*rl_completion_entry_function;
+extern CPFunction	*rl_completion_entry_function;
 extern CPPFunction	*rl_attempted_completion_function;
 extern int		rl_completion_type;
 extern int		rl_completion_query_items;

--- 1.10/cmd-line-utils/libedit/readline.c	2006-02-13 14:02:35 +01:00
+++ 1.11/cmd-line-utils/libedit/readline.c	2007-01-31 15:25:53 +01:00
@@ -112,7 +112,7 @@
 char *rl_basic_word_break_characters = break_chars;
 char *rl_completer_word_break_characters = NULL;
 char *rl_completer_quote_characters = NULL;
-Function *rl_completion_entry_function = NULL;
+CPFunction *rl_completion_entry_function = NULL;
 CPPFunction *rl_attempted_completion_function = NULL;
 Function *rl_pre_input_hook = NULL;
 Function *rl_startup1_hook = NULL;
@@ -1724,7 +1724,7 @@
 static int
 _rl_complete_internal(int what_to_do)
 {
-	Function *complet_func;
+	CPFunction *complet_func;
 	const LineInfo *li;
 	char *temp, **matches;
 	const char *ctemp;
@@ -1737,7 +1737,7 @@
 
 	complet_func = rl_completion_entry_function;
 	if (!complet_func)
-		complet_func = (Function *)(void *)filename_completion_function;
+		complet_func = filename_completion_function;
 
 	/* We now look backwards for the start of a filename/variable word */
 	li = el_line(e);
@@ -1764,7 +1764,7 @@
 	} else
 		matches = 0;
 	if (!rl_attempted_completion_function || !matches)
-		matches = completion_matches(temp, (CPFunction *)complet_func);
+		matches = completion_matches(temp, complet_func);
 
 	if (matches) {
 		int i, retval = CC_REFRESH;
@@ -1789,8 +1789,7 @@
 			 * object is a directory.
 			 */
 			size_t alen = strlen(matches[0]);
-			if ((complet_func !=
-			    (Function *)filename_completion_function
+			if ((complet_func != filename_completion_function
 			      || (alen > 0 && (matches[0])[alen - 1] != '/'))
 			    && rl_completion_append_character) {
 				char buf[2];