[Toxine-cvs] CVS: toxine/readline Makefile.am,1.2,1.3 bind.c,1.2,1.3 complete.c,1.2,1.3 rldefs.h,1.1.1.1,1.2 rltty.c,1.2,1.3

[Daniel Caujolle-B. <f1...@us...>]

Update of /cvsroot/toxine/toxine/readline
In directory sc8-pr-cvs1:/tmp/cvs-serv11580/readline

Modified Files:
	Makefile.am bind.c complete.c rldefs.h rltty.c 
Log Message:
sync readline from xine-ui one

Index: Makefile.am
===================================================================
RCS file: /cvsroot/toxine/toxine/readline/Makefile.am,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Makefile.am	15 Oct 2003 16:48:13 -0000	1.2
+++ Makefile.am	15 Oct 2003 18:05:46 -0000	1.3
@@ -1,21 +1,76 @@
 
-CFLAGS = @CFLAGS@ @READLINE_LOCAL_CFLAGS@ -DRL_LIBRARY_VERSION=\"@LIBVERSION@\" -static
+AM_CFLAGS = @READLINE_LOCAL_CFLAGS@ -DRL_LIBRARY_VERSION=\"@LIBVERSION@\" -static
 
-LIBTOOL = $(SHELL) $(top_builddir)/libtoollib-nofpic
+if HAVE_TERMCAP
+readline_lib = libreadline.la
+endif
 
-noinst_LTLIBRARIES = libreadline.la
+noinst_LTLIBRARIES = $(readline_lib)
 
-EXTRA_DIST = emacs_keymap.c vi_keymap.c savestring.c histexpand.c \
-	CHANGELOG CHANGES COPYING INSTALL MANIFEST README USAGE
+EXTRA_DIST = \
+	CHANGELOG \
+	CHANGES \
+	COPYING \
+	INSTALL \
+	MANIFEST \
+	README \
+	USAGE \
+	emacs_keymap.c \
+	histexpand.c \
+	savestring.c \
+	vi_keymap.c
 
-libreadline_la_SOURCES = readline.c vi_mode.c funmap.c keymaps.c parens.c search.c rltty.c \
-	complete.c bind.c isearch.c display.c signals.c util.c kill.c undo.c macro.c input.c \
-	callback.c terminal.c nls.c compat.c xmalloc.c history.c histexpand.c histfile.c \
-	histsearch.c shell.c tilde.c
+libreadline_la_SOURCES = \
+	bind.c \
+	callback.c \
+	compat.c \
+	complete.c \
+	display.c \
+	funmap.c \
+	history.c \
+	histexpand.c \
+	histfile.c \
+	histsearch.c \
+	input.c \
+	isearch.c \
+	keymaps.c \
+	kill.c \
+	macro.c \
+	nls.c \
+	parens.c \
+	readline.c \
+	rltty.c \
+	search.c \
+	shell.c \
+	signals.c \
+	terminal.c \
+	tilde.c \
+	undo.c \
+	util.c \
+	vi_mode.c \
+	xmalloc.c 
 
-noinst_HEADERS = ansi_stdlib.h history.h posixjmp.h rlconf.h rlshell.h rltypedefs.h tilde.h \
-	chardefs.h keymaps.h posixstat.h rldefs.h rlstdc.h rlwinsize.h xmalloc.h histlib.h \
-	posixdir.h readline.h rlprivate.h rltty.h tcap.h
+noinst_HEADERS = \
+	ansi_stdlib.h \
+	chardefs.h \
+	histlib.h \
+	history.h \
+	keymaps.h \
+	posixdir.h \
+	posixjmp.h \
+	posixstat.h \
+	readline.h \
+	rlconf.h \
+	rldefs.h \
+	rlprivate.h \
+	rlshell.h \
+	rlstdc.h \
+	rltty.h \
+	rltypedefs.h \
+	rlwinsize.h \
+	tcap.h \
+	tilde.h \
+	xmalloc.h 
 
 debug:
 	@$(MAKE) CFLAGS="$(DEBUG_CFLAGS) @READLINE_LOCAL_CFLAGS@ -DRL_LIBRARY_VERSION=\\\"@LIBVERSION@\\\" -static"

Index: bind.c
===================================================================
RCS file: /cvsroot/toxine/toxine/readline/bind.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- bind.c	16 Jul 2002 09:15:28 -0000	1.2
+++ bind.c	15 Oct 2003 18:05:46 -0000	1.3
@@ -1027,7 +1027,7 @@
   if (*string == '"')
     {
       int passc = 0;
-      
+
       for (i = 1; (c = string[i]); i++)
 	{
 	  if (passc)

Index: complete.c
===================================================================
RCS file: /cvsroot/toxine/toxine/readline/complete.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- complete.c	16 Jul 2002 09:15:28 -0000	1.2
+++ complete.c	15 Oct 2003 18:05:46 -0000	1.3
@@ -1430,7 +1430,7 @@
 
   while ((string = (*entry_function) (text, matches)))
     {
-      if (matches + 1 == match_list_size)
+      if ((matches + 1) == match_list_size)
 	match_list = (char **)xrealloc
 	  (match_list, ((match_list_size += 10) + 1) * sizeof (char *));
 

Index: rldefs.h
===================================================================
RCS file: /cvsroot/toxine/toxine/readline/rldefs.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- rldefs.h	13 May 2002 20:45:45 -0000	1.1.1.1
+++ rldefs.h	15 Oct 2003 18:05:46 -0000	1.2
@@ -74,7 +74,7 @@
 #define _rl_strnicmp strncasecmp
 #else
 extern int _rl_stricmp PARAMS((char *, char *));
-extern int _rl_strnicmp PARAMS((char *, char *));
+extern int _rl_strnicmp PARAMS((char *, char *, int));
 #endif
 
 #if defined (HAVE_STRPBRK)

Index: rltty.c
===================================================================
RCS file: /cvsroot/toxine/toxine/readline/rltty.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- rltty.c	16 Jul 2002 09:15:28 -0000	1.2
+++ rltty.c	15 Oct 2003 18:05:46 -0000	1.3
@@ -647,7 +647,7 @@
   if (get_tty_settings (tty, &tio) < 0)
     {
       release_sigint ();
-      fprintf(stderr, "readline: warning: rl_prep_terminal: cannot get terminal settings");
+fprintf(stderr, "readline: warning: rl_prep_terminal: cannot get terminal settings");
       return;
     }