Hello community,
here is the log from the commit of package libedit
checked in at Tue Jan 9 18:14:03 CET 2007.
--------
--- libedit/libedit.changes 2006-10-26 15:19:19.000000000 +0200
+++ /mounts/work_src_done/STABLE/libedit/libedit.changes 2007-01-09 18:00:45.103769000 +0100
@@ -1,0 +2,8 @@
+Tue Jan 9 17:50:24 CET 2007 - mrueckert@suse.de
+
+- update to 20061228-2.10:
+ * version-info: 0:23:0
+ * src/shlib_version: Upstream bumped minor version from 9 to 10.
+ * all: sync with upstream source. More readline functions.
+
+-------------------------------------------------------------------
Old:
----
libedit-20061022-2.9.tar.gz
New:
----
libedit-20061228-2.10.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libedit.spec ++++++
--- /var/tmp/diff_new_pack.x19733/_old 2007-01-09 18:13:07.000000000 +0100
+++ /var/tmp/diff_new_pack.x19733/_new 2007-01-09 18:13:07.000000000 +0100
@@ -1,7 +1,7 @@
#
-# spec file for package libedit (Version 2.9.snap20061022)
+# spec file for package libedit (Version 2.10.snap20061228)
#
-# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
@@ -12,8 +12,8 @@
Name: libedit
#
-%define pkg_version 20061022-2.9
-Version: 2.9.snap20061022
+%define pkg_version 20061228-2.10
+Version: 2.10.snap20061228
Release: 1
#
License: BSD License and BSD-like
@@ -42,6 +42,7 @@
%package devel
Group: Development/Libraries/C and C++
Requires: %{name} = %{version}
+Requires: ncurses-devel
#
Summary: Development files for libedit
@@ -92,6 +93,11 @@
%{_mandir}/man3/*.3*
%changelog -n libedit
+* Tue Jan 09 2007 - mrueckert@suse.de
+- update to 20061228-2.10:
+ * version-info: 0:23:0
+ * src/shlib_version: Upstream bumped minor version from 9 to 10.
+ * all: sync with upstream source. More readline functions.
* Sun Oct 22 2006 - mrueckert@suse.de
- update to 20061022-2.9:
synced with upstream source.
++++++ libedit-20061022-2.9.tar.gz -> libedit-20061228-2.10.tar.gz ++++++
++++ 4467 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libedit-20061022-2.9/ChangeLog new/libedit-20061228-2.10/ChangeLog
--- old/libedit-20061022-2.9/ChangeLog 2006-10-22 15:26:12.000000000 +0200
+++ new/libedit-20061228-2.10/ChangeLog 2006-12-28 22:00:13.000000000 +0100
@@ -1,5 +1,13 @@
2006-10-22 Jess Thrysoee
+ * version-info: 0:23:0
+
+ * src/shlib_version: Upstream bumped minor version from 9 to 10.
+
+ * all: sync with upstream source. More readline functions.
+
+2006-10-22 Jess Thrysoee
+
* version-info: 0:22:0
* all: sync with upstream source.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libedit-20061022-2.9/configure.ac new/libedit-20061228-2.10/configure.ac
--- old/libedit-20061022-2.9/configure.ac 2006-10-22 15:25:37.000000000 +0200
+++ new/libedit-20061228-2.10/configure.ac 2006-12-28 21:52:36.000000000 +0100
@@ -9,7 +9,7 @@
AC_PROG_LIBTOOL
# libtool -version-info
-AC_SUBST(LT_VERSION, [0:22:0])
+AC_SUBST(LT_VERSION, [0:23:0])
# AC_PROG_LIBTOOL runs AC_CANONICAL_HOST
case $host in
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libedit-20061022-2.9/doc/editline.3.roff new/libedit-20061228-2.10/doc/editline.3.roff
--- old/libedit-20061022-2.9/doc/editline.3.roff 2006-10-22 15:25:36.000000000 +0200
+++ new/libedit-20061228-2.10/doc/editline.3.roff 2006-12-28 21:52:36.000000000 +0100
@@ -1,4 +1,4 @@
-.\" $NetBSD: editline.3,v 1.51 2006/08/21 12:45:30 christos Exp $
+.\" $NetBSD: editline.3,v 1.54 2006/12/18 00:03:43 wiz Exp $
.\"
.\" Copyright (c) 1997-2003 The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -29,7 +29,7 @@
.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
.\" POSSIBILITY OF SUCH DAMAGE.
.\"
-.Dd September 9, 2005
+.Dd December 15, 2006
.Os
.Dt EDITLINE 3
.Sh NAME
@@ -78,7 +78,7 @@
.Ft int
.Fn el_set "EditLine *e" "int op" "..."
.Ft int
-.Fn el_get "EditLine *e" "int op" "void *result"
+.Fn el_get "EditLine *e" "int op" "..."
.Ft int
.Fn el_source "EditLine *e" "const char *file"
.Ft void
@@ -399,6 +399,25 @@
It can be retrieved with the corresponding
.Fn el_get
call.
+.It Dv EL_SETFP , Fa "int fd" , Fa "FILE *fp"
+Set the current
+.Nm editline
+file pointer for
+.Dq input
+.Fa fd
+=
+.Dv 0 ,
+.Dq output
+.Fa fd
+=
+.Dv 1 ,
+or
+.Dq error
+.Fa fd
+=
+.Dv 2
+from
+.Fa fp .
.El
.It Fn el_get
Get
@@ -423,15 +442,24 @@
.Dq emacs
or
.Dq vi .
+.It Dv EL_GETTC , Fa "const char *name" , Fa "void *value"
+Return non-zero if
+.Fa name
+is a valid
+.Xr termcap 5
+capability
+and set
+.Fa value
+to the current value of that capability.
.It Dv EL_SIGNAL , Fa "int *"
Return non-zero if
.Nm
has installed private signal handlers (see
.Fn el_get
above).
-.It Dv EL_EDITMODE, Fa "int *"
+.It Dv EL_EDITMODE , Fa "int *"
Return non-zero if editing is enabled.
-.It Dv EL_GETCFN, Fa "int (**f)(EditLine *, char *)"
+.It Dv EL_GETCFN , Fa "int (**f)(EditLine *, char *)"
Return a pointer to the function that read characters, which is equal to
``EL_BUILTIN_GETCFN'' in the case of the default builtin function.
.It Dv EL_CLIENTDATA , Fa "void **data"
@@ -440,13 +468,32 @@
previously registered with the corresponding
.Fn el_set
call.
-.It Dv EL_UNBUFFERED, Fa "int"
+.It Dv EL_UNBUFFERED , Fa "int"
Sets or clears unbuffered mode.
In this mode,
.Fn el_gets
will return immediately after processing a single character.
-.It Dv EL_PREP_TERM, Fa "int"
+.It Dv EL_PREP_TERM , Fa "int"
Sets or clears terminal editing mode.
+.It Dv EL_GETFP , Fa "int fd", Fa "FILE **fp"
+Return in
+.Fa fp
+the current
+.Nm editline
+file pointer for
+.Dq input
+.Fa fd
+=
+.Dv 0 ,
+.Dq output
+.Fa fd
+=
+.Dv 1 ,
+or
+.Dq error
+.Fa fd
+=
+.Dv 2 .
.El
.It Fn el_source
Initialise
@@ -729,8 +776,9 @@
.Sh SEE ALSO
.Xr sh 1 ,
.Xr signal 3 ,
-.Xr curses 3 ,
-.Xr editrc 5
+.Xr termcap 3 ,
+.Xr editrc 5 ,
+.Xr termcap 5
.Sh HISTORY
The
.Nm
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libedit-20061022-2.9/patches/00-readline.h.patch new/libedit-20061228-2.10/patches/00-readline.h.patch
--- old/libedit-20061022-2.9/patches/00-readline.h.patch 2006-10-22 15:25:36.000000000 +0200
+++ new/libedit-20061228-2.10/patches/00-readline.h.patch 2006-12-28 21:52:36.000000000 +0100
@@ -1,5 +1,5 @@
---- export/src/editline/readline.h 2006-10-22 15:15:43.000000000 +0200
-+++ ../src/editline/readline.h 2006-10-22 15:25:36.000000000 +0200
+--- export/src/editline/readline.h 2006-12-28 21:46:09.000000000 +0100
++++ ../src/editline/readline.h 2006-12-28 21:52:36.000000000 +0100
@@ -45,9 +45,11 @@
typedef char *CPFunction(const char *, int);
typedef char **CPPFunction(const char *, int, int);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libedit-20061022-2.9/patches/01-strlcat.c.patch new/libedit-20061228-2.10/patches/01-strlcat.c.patch
--- old/libedit-20061022-2.9/patches/01-strlcat.c.patch 2006-10-22 15:25:36.000000000 +0200
+++ new/libedit-20061228-2.10/patches/01-strlcat.c.patch 2006-12-28 21:52:36.000000000 +0100
@@ -1,5 +1,5 @@
---- export/src/strlcat.c 2006-10-22 15:15:43.000000000 +0200
-+++ ../src/strlcat.c 2006-10-22 15:25:36.000000000 +0200
+--- export/src/strlcat.c 2006-12-28 21:46:09.000000000 +0100
++++ ../src/strlcat.c 2006-12-28 21:52:36.000000000 +0100
@@ -17,19 +17,12 @@
* CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libedit-20061022-2.9/patches/02-strlcpy.c.patch new/libedit-20061228-2.10/patches/02-strlcpy.c.patch
--- old/libedit-20061022-2.9/patches/02-strlcpy.c.patch 2006-10-22 15:25:36.000000000 +0200
+++ new/libedit-20061228-2.10/patches/02-strlcpy.c.patch 2006-12-28 21:52:36.000000000 +0100
@@ -1,5 +1,5 @@
---- export/src/strlcpy.c 2006-10-22 15:15:43.000000000 +0200
-+++ ../src/strlcpy.c 2006-10-22 15:25:36.000000000 +0200
+--- export/src/strlcpy.c 2006-12-28 21:46:09.000000000 +0100
++++ ../src/strlcpy.c 2006-12-28 21:52:36.000000000 +0100
@@ -17,19 +17,12 @@
* CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libedit-20061022-2.9/patches/03-vis.c.patch new/libedit-20061228-2.10/patches/03-vis.c.patch
--- old/libedit-20061022-2.9/patches/03-vis.c.patch 2006-10-22 15:25:36.000000000 +0200
+++ new/libedit-20061228-2.10/patches/03-vis.c.patch 2006-12-28 21:52:36.000000000 +0100
@@ -1,5 +1,5 @@
---- export/src/vis.c 2006-10-22 15:15:43.000000000 +0200
-+++ ../src/vis.c 2006-10-22 15:25:36.000000000 +0200
+--- export/src/vis.c 2006-12-28 21:46:09.000000000 +0100
++++ ../src/vis.c 2006-12-28 21:52:36.000000000 +0100
@@ -58,12 +58,30 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libedit-20061022-2.9/patches/04-unvis.c.patch new/libedit-20061228-2.10/patches/04-unvis.c.patch
--- old/libedit-20061022-2.9/patches/04-unvis.c.patch 2006-10-22 15:25:36.000000000 +0200
+++ new/libedit-20061228-2.10/patches/04-unvis.c.patch 2006-12-28 21:52:36.000000000 +0100
@@ -1,5 +1,5 @@
---- export/src/unvis.c 2006-10-22 15:15:43.000000000 +0200
-+++ ../src/unvis.c 2006-10-22 15:25:36.000000000 +0200
+--- export/src/unvis.c 2006-12-28 21:46:09.000000000 +0100
++++ ../src/unvis.c 2006-12-28 21:52:36.000000000 +0100
@@ -29,7 +29,7 @@
* SUCH DAMAGE.
*/
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libedit-20061022-2.9/patches/05-vis.h.patch new/libedit-20061228-2.10/patches/05-vis.h.patch
--- old/libedit-20061022-2.9/patches/05-vis.h.patch 2006-10-22 15:25:37.000000000 +0200
+++ new/libedit-20061228-2.10/patches/05-vis.h.patch 2006-12-28 21:52:36.000000000 +0100
@@ -1,5 +1,5 @@
---- export/src/vis.h 2006-10-22 15:15:43.000000000 +0200
-+++ ../src/vis.h 2006-10-22 15:25:36.000000000 +0200
+--- export/src/vis.h 2006-12-28 21:46:09.000000000 +0100
++++ ../src/vis.h 2006-12-28 21:52:36.000000000 +0100
@@ -34,7 +34,7 @@
#ifndef _VIS_H_
#define _VIS_H_
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libedit-20061022-2.9/patches/06-fgetln.c.patch new/libedit-20061228-2.10/patches/06-fgetln.c.patch
--- old/libedit-20061022-2.9/patches/06-fgetln.c.patch 2006-10-22 15:25:37.000000000 +0200
+++ new/libedit-20061228-2.10/patches/06-fgetln.c.patch 2006-12-28 21:52:36.000000000 +0100
@@ -1,5 +1,5 @@
---- export/src/fgetln.c 2006-10-22 15:15:43.000000000 +0200
-+++ ../src/fgetln.c 2006-10-22 15:25:36.000000000 +0200
+--- export/src/fgetln.c 2006-12-28 21:46:09.000000000 +0100
++++ ../src/fgetln.c 2006-12-28 21:52:36.000000000 +0100
@@ -37,6 +37,7 @@
#endif
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libedit-20061022-2.9/patches/07-el_term.h.patch new/libedit-20061228-2.10/patches/07-el_term.h.patch
--- old/libedit-20061022-2.9/patches/07-el_term.h.patch 2006-10-22 15:25:37.000000000 +0200
+++ new/libedit-20061228-2.10/patches/07-el_term.h.patch 2006-12-28 21:52:36.000000000 +0100
@@ -1,5 +1,5 @@
---- export/src/el_term.h 2006-10-22 15:15:43.000000000 +0200
-+++ ../src/el_term.h 2006-10-22 15:25:36.000000000 +0200
+--- export/src/el_term.h 2006-12-28 21:46:09.000000000 +0100
++++ ../src/el_term.h 2006-12-28 21:52:36.000000000 +0100
@@ -81,6 +81,15 @@
#define A_K_EN 5
#define A_K_NKEYS 6
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libedit-20061022-2.9/patches/08-el.c.patch new/libedit-20061228-2.10/patches/08-el.c.patch
--- old/libedit-20061022-2.9/patches/08-el.c.patch 2006-10-22 15:25:37.000000000 +0200
+++ new/libedit-20061228-2.10/patches/08-el.c.patch 2006-12-28 21:52:36.000000000 +0100
@@ -1,6 +1,6 @@
---- export/src/el.c 2006-10-22 15:15:43.000000000 +0200
-+++ ../src/el.c 2006-10-22 15:25:36.000000000 +0200
-@@ -435,12 +435,17 @@
+--- export/src/el.c 2006-12-28 21:46:09.000000000 +0100
++++ ../src/el.c 2006-12-28 21:52:36.000000000 +0100
+@@ -473,12 +473,17 @@
fp = NULL;
if (fname == NULL) {
@@ -19,7 +19,7 @@
if ((ptr = getenv("HOME")) == NULL)
return (-1);
if (strlcpy(path, ptr, sizeof(path)) >= sizeof(path))
-@@ -448,14 +453,6 @@
+@@ -486,14 +491,6 @@
if (strlcat(path, elpath, sizeof(path)) >= sizeof(path))
return (-1);
fname = path;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libedit-20061022-2.9/patches/09-el.h.patch new/libedit-20061228-2.10/patches/09-el.h.patch
--- old/libedit-20061022-2.9/patches/09-el.h.patch 2006-10-22 15:25:37.000000000 +0200
+++ new/libedit-20061228-2.10/patches/09-el.h.patch 2006-12-28 21:52:36.000000000 +0100
@@ -1,5 +1,5 @@
---- export/src/el.h 2006-10-22 15:15:43.000000000 +0200
-+++ ../src/el.h 2006-10-22 15:25:36.000000000 +0200
+--- export/src/el.h 2006-12-28 21:46:09.000000000 +0100
++++ ../src/el.h 2006-12-28 21:52:36.000000000 +0100
@@ -96,7 +96,7 @@
#include "tty.h"
#include "prompt.h"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libedit-20061022-2.9/patches/10-filecomplete.c.patch new/libedit-20061228-2.10/patches/10-filecomplete.c.patch
--- old/libedit-20061022-2.9/patches/10-filecomplete.c.patch 2006-10-22 15:25:37.000000000 +0200
+++ new/libedit-20061228-2.10/patches/10-filecomplete.c.patch 2006-12-28 21:52:36.000000000 +0100
@@ -1,5 +1,5 @@
---- export/src/filecomplete.c 2006-10-22 15:15:43.000000000 +0200
-+++ ../src/filecomplete.c 2006-10-22 15:25:36.000000000 +0200
+--- export/src/filecomplete.c 2006-12-28 21:46:09.000000000 +0100
++++ ../src/filecomplete.c 2006-12-28 21:52:36.000000000 +0100
@@ -31,8 +31,27 @@
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
@@ -27,7 +27,7 @@
-#include "config.h"
#if !defined(lint) && !defined(SCCSID)
- __RCSID("$NetBSD: filecomplete.c,v 1.9 2006/08/21 12:45:30 christos Exp $");
+ __RCSID("$NetBSD: filecomplete.c,v 1.10 2006/11/09 16:58:38 christos Exp $");
#endif /* not lint && not SCCSID */
@@ -49,14 +68,8 @@
#include
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libedit-20061022-2.9/patches/11-history.c.patch new/libedit-20061228-2.10/patches/11-history.c.patch
--- old/libedit-20061022-2.9/patches/11-history.c.patch 2006-10-22 15:25:37.000000000 +0200
+++ new/libedit-20061228-2.10/patches/11-history.c.patch 2006-12-28 21:52:36.000000000 +0100
@@ -1,5 +1,5 @@
---- export/src/history.c 2006-10-22 15:15:43.000000000 +0200
-+++ ../src/history.c 2006-10-22 15:25:36.000000000 +0200
+--- export/src/history.c 2006-12-28 21:46:09.000000000 +0100
++++ ../src/history.c 2006-12-28 21:52:36.000000000 +0100
@@ -47,11 +47,7 @@
#include
#include
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libedit-20061022-2.9/patches/12-readline.c.patch new/libedit-20061228-2.10/patches/12-readline.c.patch
--- old/libedit-20061022-2.9/patches/12-readline.c.patch 2006-10-22 15:25:37.000000000 +0200
+++ new/libedit-20061228-2.10/patches/12-readline.c.patch 2006-12-28 21:52:36.000000000 +0100
@@ -1,5 +1,5 @@
---- export/src/readline.c 2006-10-22 15:15:43.000000000 +0200
-+++ ../src/readline.c 2006-10-22 15:25:36.000000000 +0200
+--- export/src/readline.c 2006-12-28 21:46:09.000000000 +0100
++++ ../src/readline.c 2006-12-28 21:52:36.000000000 +0100
@@ -32,7 +32,26 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
@@ -26,12 +26,12 @@
+#endif
+
#if !defined(lint) && !defined(SCCSID)
- __RCSID("$NetBSD: readline.c,v 1.69 2006/08/21 12:45:30 christos Exp $");
+ __RCSID("$NetBSD: readline.c,v 1.70 2006/11/24 00:01:17 christos Exp $");
#endif /* not lint && not SCCSID */
-@@ -49,18 +68,12 @@
- #include
+@@ -50,18 +69,11 @@
#include
#include
+ #include
-#ifdef HAVE_VIS_H
#include
-#else
@@ -40,7 +40,6 @@
-#ifdef HAVE_ALLOCA_H
-#include
-#endif
-+
#include "el.h"
#include "fcns.h" /* for EL_NUM_FCNS */
#include "histedit.h"
@@ -49,7 +48,7 @@
#include "filecomplete.h"
void rl_prep_terminal(int);
-@@ -191,7 +204,7 @@
+@@ -198,7 +210,7 @@
return (HIST_ENTRY *) NULL;
rl_he.line = ev.str;
@@ -58,7 +57,7 @@
return (&rl_he);
}
-@@ -1427,8 +1440,7 @@
+@@ -1437,8 +1449,7 @@
char *
username_completion_function(const char *text, int state)
{
@@ -68,7 +67,7 @@
if (text[0] == '\0')
return (NULL);
-@@ -1439,9 +1451,9 @@
+@@ -1449,9 +1460,9 @@
if (state == 0)
setpwent();
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libedit-20061022-2.9/patches/13-search.c.patch new/libedit-20061228-2.10/patches/13-search.c.patch
--- old/libedit-20061022-2.9/patches/13-search.c.patch 2006-10-22 15:25:37.000000000 +0200
+++ new/libedit-20061228-2.10/patches/13-search.c.patch 2006-12-28 21:52:36.000000000 +0100
@@ -1,5 +1,5 @@
---- export/src/search.c 2006-10-22 15:15:43.000000000 +0200
-+++ ../src/search.c 2006-10-22 15:25:36.000000000 +0200
+--- export/src/search.c 2006-12-28 21:46:09.000000000 +0100
++++ ../src/search.c 2006-12-28 21:52:36.000000000 +0100
@@ -45,6 +45,7 @@
* search.c: History and character search functions
*/
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libedit-20061022-2.9/patches/14-sys.h.patch new/libedit-20061228-2.10/patches/14-sys.h.patch
--- old/libedit-20061022-2.9/patches/14-sys.h.patch 2006-10-22 15:25:37.000000000 +0200
+++ new/libedit-20061228-2.10/patches/14-sys.h.patch 2006-12-28 21:52:36.000000000 +0100
@@ -1,5 +1,5 @@
---- export/src/sys.h 2006-10-22 15:15:43.000000000 +0200
-+++ ../src/sys.h 2006-10-22 15:25:36.000000000 +0200
+--- export/src/sys.h 2006-12-28 21:46:09.000000000 +0100
++++ ../src/sys.h 2006-12-28 21:52:36.000000000 +0100
@@ -40,6 +40,8 @@
#ifndef _h_sys
#define _h_sys
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libedit-20061022-2.9/patches/15-term.c.patch new/libedit-20061228-2.10/patches/15-term.c.patch
--- old/libedit-20061022-2.9/patches/15-term.c.patch 2006-10-22 15:25:37.000000000 +0200
+++ new/libedit-20061228-2.10/patches/15-term.c.patch 2006-12-28 21:52:36.000000000 +0100
@@ -1,5 +1,5 @@
---- export/src/term.c 2006-10-22 15:15:43.000000000 +0200
-+++ ../src/term.c 2006-10-22 15:25:36.000000000 +0200
+--- export/src/term.c 2006-12-28 21:46:09.000000000 +0100
++++ ../src/term.c 2006-12-28 21:52:36.000000000 +0100
@@ -51,19 +51,18 @@
#include
#include
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libedit-20061022-2.9/patches/16-tc1.c.patch new/libedit-20061228-2.10/patches/16-tc1.c.patch
--- old/libedit-20061022-2.9/patches/16-tc1.c.patch 2006-10-22 15:25:37.000000000 +0200
+++ new/libedit-20061228-2.10/patches/16-tc1.c.patch 2006-12-28 21:52:36.000000000 +0100
@@ -1,5 +1,5 @@
---- export/examples/tc1.c 2006-10-22 15:15:43.000000000 +0200
-+++ ../examples/tc1.c 2006-10-22 15:25:36.000000000 +0200
+--- export/examples/tc1.c 2006-12-28 21:46:09.000000000 +0100
++++ ../examples/tc1.c 2006-12-28 21:52:36.000000000 +0100
@@ -32,20 +32,6 @@
* SUCH DAMAGE.
*/
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libedit-20061022-2.9/patches/17-editline.3.roff.patch new/libedit-20061228-2.10/patches/17-editline.3.roff.patch
--- old/libedit-20061022-2.9/patches/17-editline.3.roff.patch 2006-10-22 15:25:37.000000000 +0200
+++ new/libedit-20061228-2.10/patches/17-editline.3.roff.patch 2006-12-28 21:52:36.000000000 +0100
@@ -1,5 +1,5 @@
---- export/doc/editline.3.roff 2006-10-22 15:15:43.000000000 +0200
-+++ ../doc/editline.3.roff 2006-10-22 15:25:36.000000000 +0200
+--- export/doc/editline.3.roff 2006-12-28 21:46:09.000000000 +0100
++++ ../doc/editline.3.roff 2006-12-28 21:52:36.000000000 +0100
@@ -115,10 +115,11 @@
These functions are available in the
.Nm libedit
@@ -14,7 +14,7 @@
.Sh LINE EDITING FUNCTIONS
The line editing functions use a common data structure,
.Fa EditLine ,
-@@ -664,8 +665,10 @@
+@@ -711,8 +712,10 @@
to be used by all other tokenizer functions.
.Fa IFS
contains the Input Field Separators, which defaults to
@@ -27,12 +27,3 @@
and
.Aq newline
if
-@@ -726,7 +729,7 @@
- .Sh SEE ALSO
- .Xr sh 1 ,
- .Xr signal 3 ,
--.Xr termcap 3 ,
-+.Xr curses 3 ,
- .Xr editrc 5
- .Sh HISTORY
- The
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libedit-20061022-2.9/patches/18-editrc.5.roff.patch new/libedit-20061228-2.10/patches/18-editrc.5.roff.patch
--- old/libedit-20061022-2.9/patches/18-editrc.5.roff.patch 2006-10-22 15:25:37.000000000 +0200
+++ new/libedit-20061228-2.10/patches/18-editrc.5.roff.patch 2006-12-28 21:52:36.000000000 +0100
@@ -1,5 +1,5 @@
---- export/doc/editrc.5.roff 2006-10-22 15:15:43.000000000 +0200
-+++ ../doc/editrc.5.roff 2006-10-22 15:25:36.000000000 +0200
+--- export/doc/editrc.5.roff 2006-12-28 21:46:09.000000000 +0100
++++ ../doc/editrc.5.roff 2006-12-28 21:52:36.000000000 +0100
@@ -157,7 +157,7 @@
.Ar command
can contain control characters of the form
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libedit-20061022-2.9/patches/timestamp.cvsexport new/libedit-20061228-2.10/patches/timestamp.cvsexport
--- old/libedit-20061022-2.9/patches/timestamp.cvsexport 2006-10-22 15:15:43.000000000 +0200
+++ new/libedit-20061228-2.10/patches/timestamp.cvsexport 2006-12-28 21:46:09.000000000 +0100
@@ -1 +1 @@
-20061022
+20061228
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libedit-20061022-2.9/src/editline/readline.h new/libedit-20061228-2.10/src/editline/readline.h
--- old/libedit-20061022-2.9/src/editline/readline.h 2006-10-22 15:25:36.000000000 +0200
+++ new/libedit-20061228-2.10/src/editline/readline.h 2006-12-28 21:52:36.000000000 +0100
@@ -1,4 +1,4 @@
-/* $NetBSD: readline.h,v 1.18 2006/08/21 12:45:30 christos Exp $ */
+/* $NetBSD: readline.h,v 1.19 2006/11/24 00:01:17 christos Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -125,6 +125,8 @@
extern VFunction *rl_completion_display_matches_hook;
extern VFunction *rl_prep_term_function;
extern VFunction *rl_deprep_term_function;
+extern int readline_echoing_p;
+extern int _rl_print_completions_horizontally;
/* supported functions */
char *readline(const char *);
@@ -178,11 +180,18 @@
int rl_variable_bind(const char *, const char *);
void rl_stuff_char(int);
int rl_add_defun(const char *, Function *, int);
+void rl_get_screen_size(int *, int *);
+void rl_set_screen_size(int, int);
+char *rl_filename_completion_function (const char *, int);
+int _rl_abort_internal(void);
+int _rl_qsort_string_compare(char **, char **);
/*
* The following are not implemented
*/
+int rl_kill_text(int, int);
Keymap rl_get_keymap(void);
+void rl_set_keymap(Keymap);
Keymap rl_make_bare_keymap(void);
int rl_generic_bind(int, const char *, const char *, Keymap);
int rl_bind_key_in_map(int, Function *, Keymap);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libedit-20061022-2.9/src/el.c new/libedit-20061228-2.10/src/el.c
--- old/libedit-20061022-2.9/src/el.c 2006-10-22 15:25:36.000000000 +0200
+++ new/libedit-20061228-2.10/src/el.c 2006-12-28 21:52:36.000000000 +0100
@@ -1,4 +1,4 @@
-/* $NetBSD: el.c,v 1.41 2005/08/19 04:21:47 christos Exp $ */
+/* $NetBSD: el.c,v 1.44 2006/12/15 22:13:33 christos Exp $ */
/*-
* Copyright (c) 1992, 1993
@@ -37,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)el.c 8.2 (Berkeley) 1/3/94";
#else
-__RCSID("$NetBSD: el.c,v 1.41 2005/08/19 04:21:47 christos Exp $");
+__RCSID("$NetBSD: el.c,v 1.44 2006/12/15 22:13:33 christos Exp $");
#endif
#endif /* not lint && not SCCSID */
@@ -65,9 +65,12 @@
memset(el, 0, sizeof(EditLine));
- el->el_infd = fileno(fin);
+ el->el_infile = fin;
el->el_outfile = fout;
el->el_errfile = ferr;
+
+ el->el_infd = fileno(fin);
+
if ((el->el_prog = el_strdup(prog)) == NULL) {
el_free(el);
return NULL;
@@ -143,29 +146,29 @@
public int
el_set(EditLine *el, int op, ...)
{
- va_list va;
+ va_list ap;
int rv = 0;
if (el == NULL)
return (-1);
- va_start(va, op);
+ va_start(ap, op);
switch (op) {
case EL_PROMPT:
case EL_RPROMPT:
- rv = prompt_set(el, va_arg(va, el_pfunc_t), op);
+ rv = prompt_set(el, va_arg(ap, el_pfunc_t), op);
break;
case EL_TERMINAL:
- rv = term_set(el, va_arg(va, char *));
+ rv = term_set(el, va_arg(ap, char *));
break;
case EL_EDITOR:
- rv = map_set_editor(el, va_arg(va, char *));
+ rv = map_set_editor(el, va_arg(ap, char *));
break;
case EL_SIGNAL:
- if (va_arg(va, int))
+ if (va_arg(ap, int))
el->el_flags |= HANDLE_SIGNALS;
else
el->el_flags &= ~HANDLE_SIGNALS;
@@ -174,6 +177,7 @@
case EL_BIND:
case EL_TELLTC:
case EL_SETTC:
+ case EL_GETTC:
case EL_ECHOTC:
case EL_SETTY:
{
@@ -181,7 +185,7 @@
int i;
for (i = 1; i < 20; i++)
- if ((argv[i] = va_arg(va, char *)) == NULL)
+ if ((argv[i] = va_arg(ap, char *)) == NULL)
break;
switch (op) {
@@ -220,9 +224,9 @@
case EL_ADDFN:
{
- char *name = va_arg(va, char *);
- char *help = va_arg(va, char *);
- el_func_t func = va_arg(va, el_func_t);
+ char *name = va_arg(ap, char *);
+ char *help = va_arg(ap, char *);
+ el_func_t func = va_arg(ap, el_func_t);
rv = map_addfunc(el, name, help, func);
break;
@@ -230,15 +234,15 @@
case EL_HIST:
{
- hist_fun_t func = va_arg(va, hist_fun_t);
- ptr_t ptr = va_arg(va, char *);
+ hist_fun_t func = va_arg(ap, hist_fun_t);
+ ptr_t ptr = va_arg(ap, char *);
rv = hist_set(el, func, ptr);
break;
}
case EL_EDITMODE:
- if (va_arg(va, int))
+ if (va_arg(ap, int))
el->el_flags &= ~EDIT_DISABLED;
else
el->el_flags |= EDIT_DISABLED;
@@ -247,17 +251,17 @@
case EL_GETCFN:
{
- el_rfunc_t rc = va_arg(va, el_rfunc_t);
+ el_rfunc_t rc = va_arg(ap, el_rfunc_t);
rv = el_read_setfn(el, rc);
break;
}
case EL_CLIENTDATA:
- el->el_data = va_arg(va, void *);
+ el->el_data = va_arg(ap, void *);
break;
case EL_UNBUFFERED:
- rv = va_arg(va, int);
+ rv = va_arg(ap, int);
if (rv && !(el->el_flags & UNBUFFERED)) {
el->el_flags |= UNBUFFERED;
read_prepare(el);
@@ -269,7 +273,7 @@
break;
case EL_PREP_TERM:
- rv = va_arg(va, int);
+ rv = va_arg(ap, int);
if (rv)
(void) tty_rawmode(el);
else
@@ -277,12 +281,39 @@
rv = 0;
break;
+ case EL_SETFP:
+ {
+ FILE *fp;
+ int what;
+
+ what = va_arg(ap, int);
+ fp = va_arg(ap, FILE *);
+
+ rv = 0;
+ switch (what) {
+ case 0:
+ el->el_infile = fp;
+ el->el_infd = fileno(fp);
+ break;
+ case 1:
+ el->el_outfile = fp;
+ break;
+ case 2:
+ el->el_errfile = fp;
+ break;
+ default:
+ rv = -1;
+ break;
+ }
+ break;
+ }
+
default:
rv = -1;
break;
}
- va_end(va);
+ va_end(ap);
return (rv);
}
@@ -291,90 +322,71 @@
* retrieve the editline parameters
*/
public int
-el_get(EditLine *el, int op, void *ret)
+el_get(EditLine *el, int op, ...)
{
+ va_list ap;
int rv;
- if (el == NULL || ret == NULL)
- return (-1);
+ if (el == NULL)
+ return -1;
+
+ va_start(ap, op);
+
switch (op) {
case EL_PROMPT:
case EL_RPROMPT:
- rv = prompt_get(el, (el_pfunc_t *) ret, op);
+ rv = prompt_get(el, va_arg(ap, el_pfunc_t *), op);
break;
case EL_EDITOR:
- rv = map_get_editor(el, (const char **)ret);
+ rv = map_get_editor(el, va_arg(ap, const char **));
break;
case EL_SIGNAL:
- *((int *) ret) = (el->el_flags & HANDLE_SIGNALS);
+ *va_arg(ap, int *) = (el->el_flags & HANDLE_SIGNALS);
rv = 0;
break;
case EL_EDITMODE:
- *((int *) ret) = (!(el->el_flags & EDIT_DISABLED));
+ *va_arg(ap, int *) = !(el->el_flags & EDIT_DISABLED);
rv = 0;
break;
case EL_TERMINAL:
- term_get(el, (const char **)ret);
+ term_get(el, va_arg(ap, const char **));
rv = 0;
break;
-#if 0 /* XXX */
- case EL_BIND:
- case EL_TELLTC:
- case EL_SETTC:
- case EL_ECHOTC:
- case EL_SETTY:
+ case EL_GETTC:
{
- const char *argv[20];
+ static char name[] = "gettc";
+ char *argv[20];
int i;
for (i = 1; i < sizeof(argv) / sizeof(argv[0]); i++)
- if ((argv[i] = va_arg(va, char *)) == NULL)
+ if ((argv[i] = va_arg(ap, char *)) == NULL)
break;
switch (op) {
- case EL_BIND:
- argv[0] = "bind";
- rv = map_bind(el, i, argv);
- break;
-
- case EL_TELLTC:
- argv[0] = "telltc";
- rv = term_telltc(el, i, argv);
- break;
-
- case EL_SETTC:
- argv[0] = "settc";
- rv = term_settc(el, i, argv);
- break;
-
- case EL_ECHOTC:
- argv[0] = "echotc";
- rv = term_echotc(el, i, argv);
- break;
-
- case EL_SETTY:
- argv[0] = "setty";
- rv = tty_stty(el, i, argv);
+ case EL_GETTC:
+ argv[0] = name;
+ rv = term_gettc(el, i, argv);
break;
default:
rv = -1;
- EL_ABORT((el->errfile, "Bad op %d\n", op));
+ EL_ABORT((el->el_errfile, "Bad op %d\n", op));
break;
}
break;
}
+#if 0 /* XXX */
case EL_ADDFN:
{
- char *name = va_arg(va, char *);
- char *help = va_arg(va, char *);
- el_func_t func = va_arg(va, el_func_t);
+ char *name = va_arg(ap, char *);
+ char *help = va_arg(ap, char *);
+ el_func_t func = va_arg(ap, el_func_t);
rv = map_addfunc(el, name, help, func);
break;
@@ -382,31 +394,57 @@
case EL_HIST:
{
- hist_fun_t func = va_arg(va, hist_fun_t);
- ptr_t ptr = va_arg(va, char *);
+ hist_fun_t func = va_arg(ap, hist_fun_t);
+ ptr_t ptr = va_arg(ap, char *);
rv = hist_set(el, func, ptr);
}
break;
#endif /* XXX */
case EL_GETCFN:
- *((el_rfunc_t *)ret) = el_read_getfn(el);
+ *va_arg(ap, el_rfunc_t *) = el_read_getfn(el);
rv = 0;
break;
case EL_CLIENTDATA:
- *((void **)ret) = el->el_data;
+ *va_arg(ap, void **) = el->el_data;
rv = 0;
break;
case EL_UNBUFFERED:
- *((int *) ret) = (!(el->el_flags & UNBUFFERED));
+ *va_arg(ap, int *) = (!(el->el_flags & UNBUFFERED));
rv = 0;
break;
+ case EL_GETFP:
+ {
+ int what;
+ FILE **fpp;
+
+ what = va_arg(ap, int);
+ fpp = va_arg(ap, FILE **);
+ rv = 0;
+ switch (what) {
+ case 0:
+ *fpp = el->el_infile;
+ break;
+ case 1:
+ *fpp = el->el_outfile;
+ break;
+ case 2:
+ *fpp = el->el_errfile;
+ break;
+ default:
+ rv = -1;
+ break;
+ }
+ break;
+ }
default:
rv = -1;
+ break;
}
+ va_end(ap);
return (rv);
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libedit-20061022-2.9/src/el.h new/libedit-20061228-2.10/src/el.h
--- old/libedit-20061022-2.9/src/el.h 2006-10-22 15:25:36.000000000 +0200
+++ new/libedit-20061228-2.10/src/el.h 2006-12-28 21:52:36.000000000 +0100
@@ -1,4 +1,4 @@
-/* $NetBSD: el.h,v 1.16 2003/10/18 23:48:42 christos Exp $ */
+/* $NetBSD: el.h,v 1.17 2006/12/15 22:13:33 christos Exp $ */
/*-
* Copyright (c) 1992, 1993
@@ -110,6 +110,7 @@
struct editline {
char *el_prog; /* the program name */
+ FILE *el_infile; /* Stdio stuff */
FILE *el_outfile; /* Stdio stuff */
FILE *el_errfile; /* Stdio stuff */
int el_infd; /* Input file descriptor */
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libedit-20061022-2.9/src/el_term.h new/libedit-20061228-2.10/src/el_term.h
--- old/libedit-20061022-2.9/src/el_term.h 2006-10-22 15:25:36.000000000 +0200
+++ new/libedit-20061228-2.10/src/el_term.h 2006-12-28 21:52:36.000000000 +0100
@@ -1,4 +1,4 @@
-/* $NetBSD: term.h,v 1.17 2006/03/06 21:11:56 christos Exp $ */
+/* $NetBSD: term.h,v 1.18 2006/11/24 00:01:17 christos Exp $ */
/*-
* Copyright (c) 1992, 1993
@@ -109,6 +109,7 @@
protected void term_get(EditLine *, const char **);
protected int term_set(EditLine *, const char *);
protected int term_settc(EditLine *, int, const char **);
+protected int term_gettc(EditLine *, int, char **);
protected int term_telltc(EditLine *, int, const char **);
protected int term_echotc(EditLine *, int, const char **);
protected void term_writec(EditLine *, int);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libedit-20061022-2.9/src/filecomplete.c new/libedit-20061228-2.10/src/filecomplete.c
--- old/libedit-20061022-2.9/src/filecomplete.c 2006-10-22 15:25:36.000000000 +0200
+++ new/libedit-20061228-2.10/src/filecomplete.c 2006-12-28 21:52:36.000000000 +0100
@@ -1,4 +1,4 @@
-/* $NetBSD: filecomplete.c,v 1.9 2006/08/21 12:45:30 christos Exp $ */
+/* $NetBSD: filecomplete.c,v 1.10 2006/11/09 16:58:38 christos Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -53,7 +53,7 @@
#endif
#if !defined(lint) && !defined(SCCSID)
-__RCSID("$NetBSD: filecomplete.c,v 1.9 2006/08/21 12:45:30 christos Exp $");
+__RCSID("$NetBSD: filecomplete.c,v 1.10 2006/11/09 16:58:38 christos Exp $");
#endif /* not lint && not SCCSID */
#include
@@ -412,6 +412,7 @@
const char *ctemp;
size_t len;
int what_to_do = '\t';
+ int retval = CC_NORM;
if (el->el_state.lastcmd == el->el_state.thiscmd)
what_to_do = '?';
@@ -434,7 +435,11 @@
ctemp--;
len = li->cursor - ctemp;
+#if defined(__SSP__) || defined(__SSP_ALL__)
+ temp = malloc(len + 1);
+#else
temp = alloca(len + 1);
+#endif
(void)strncpy(temp, ctemp, len);
temp[len] = '\0';
@@ -459,9 +464,10 @@
*over = 0;
if (matches) {
- int i, retval = CC_REFRESH;
+ int i;
int matches_num, maxlen, match_len, match_display=1;
+ retval = CC_REFRESH;
/*
* Only replace the completed string with common part of
* possible matches if there is possible completion.
@@ -533,11 +539,13 @@
/* free elements of array and the array itself */
for (i = 0; matches[i]; i++)
free(matches[i]);
- free(matches), matches = NULL;
-
- return (retval);
+ free(matches);
+ matches = NULL;
}
- return (CC_NORM);
+#if defined(__SSP__) || defined(__SSP_ALL__)
+ free(temp);
+#endif
+ return retval;
}
/*
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libedit-20061022-2.9/src/histedit.h new/libedit-20061228-2.10/src/histedit.h
--- old/libedit-20061022-2.9/src/histedit.h 2006-10-22 15:25:36.000000000 +0200
+++ new/libedit-20061228-2.10/src/histedit.h 2006-12-28 21:52:36.000000000 +0100
@@ -1,4 +1,4 @@
-/* $NetBSD: histedit.h,v 1.28 2005/07/14 15:00:58 christos Exp $ */
+/* $NetBSD: histedit.h,v 1.31 2006/12/15 22:13:33 christos Exp $ */
/*-
* Copyright (c) 1992, 1993
@@ -41,7 +41,7 @@
#define _HISTEDIT_H_
#define LIBEDIT_MAJOR 2
-#define LIBEDIT_MINOR 9
+#define LIBEDIT_MINOR 10
#include
#include
@@ -109,7 +109,7 @@
* Low level editline access functions
*/
int el_set(EditLine *, int, ...);
-int el_get(EditLine *, int, void *);
+int el_get(EditLine *, int, ...);
unsigned char _el_fn_complete(EditLine *, int);
/*
@@ -133,6 +133,9 @@
#define EL_CLIENTDATA 14 /* , void *); */
#define EL_UNBUFFERED 15 /* , int); */
#define EL_PREP_TERM 16 /* , int); */
+#define EL_GETTC 17 /* , const char *, ..., NULL); */
+#define EL_GETFP 18 /* , int, FILE **) */
+#define EL_SETFP 19 /* , int, FILE *) */
#define EL_BUILTIN_GETCFN (NULL)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libedit-20061022-2.9/src/readline.c new/libedit-20061228-2.10/src/readline.c
--- old/libedit-20061022-2.9/src/readline.c 2006-10-22 15:25:36.000000000 +0200
+++ new/libedit-20061228-2.10/src/readline.c 2006-12-28 21:52:36.000000000 +0100
@@ -1,4 +1,4 @@
-/* $NetBSD: readline.c,v 1.69 2006/08/21 12:45:30 christos Exp $ */
+/* $NetBSD: readline.c,v 1.70 2006/11/24 00:01:17 christos Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -53,7 +53,7 @@
#endif
#if !defined(lint) && !defined(SCCSID)
-__RCSID("$NetBSD: readline.c,v 1.69 2006/08/21 12:45:30 christos Exp $");
+__RCSID("$NetBSD: readline.c,v 1.70 2006/11/24 00:01:17 christos Exp $");
#endif /* not lint && not SCCSID */
#include
@@ -68,8 +68,8 @@
#include
#include
#include
+#include
#include
-
#include "el.h"
#include "fcns.h" /* for EL_NUM_FCNS */
#include "histedit.h"
@@ -101,6 +101,9 @@
VCPFunction *rl_linefunc = NULL;
int rl_done = 0;
VFunction *rl_event_hook = NULL;
+KEYMAP_ENTRY_ARRAY emacs_standard_keymap,
+ emacs_meta_keymap,
+ emacs_ctlx_keymap;
int history_base = 1; /* probably never subject to change */
int history_length = 0;
@@ -126,6 +129,8 @@
int rl_filename_completion_desired = 0;
int rl_ignore_completion_duplicates = 0;
int rl_catch_signals = 1;
+int readline_echoing_p = 1;
+int _rl_print_completions_horizontally = 0;
VFunction *rl_redisplay_function = NULL;
Function *rl_startup_hook = NULL;
VFunction *rl_completion_display_matches_hook = NULL;
@@ -167,6 +172,7 @@
static History *h = NULL;
static EditLine *e = NULL;
static Function *map[256];
+static jmp_buf topbuf;
/* internal functions */
static unsigned char _el_rl_complete(EditLine *, int);
@@ -335,9 +341,10 @@
* trailing newline (if there is any)
*/
char *
-readline(const char *prompt)
+readline(const char *p)
{
HistEvent ev;
+ const char * volatile prompt = p;
int count;
const char *ret;
char *buf;
@@ -348,6 +355,8 @@
rl_done = 0;
+ (void)setjmp(topbuf);
+
/* update prompt accordingly to what has been passed */
if (!prompt)
prompt = "";
@@ -1817,3 +1826,82 @@
rl_point = li->cursor - li->buffer;
rl_end = li->lastchar - li->buffer;
}
+
+void
+rl_get_screen_size(int *rows, int *cols)
+{
+ if (rows)
+ el_get(e, EL_GETTC, "li", rows);
+ if (cols)
+ el_get(e, EL_GETTC, "co", cols);
+}
+
+void
+rl_set_screen_size(int rows, int cols)
+{
+ char buf[64];
+ (void)snprintf(buf, sizeof(buf), "%d", rows);
+ el_set(e, EL_SETTC, "li", buf);
+ (void)snprintf(buf, sizeof(buf), "%d", cols);
+ el_set(e, EL_SETTC, "co", buf);
+}
+
+char *
+rl_filename_completion_function (const char *text, int state)
+{
+ return fn_filename_completion_function(text, state);
+}
+
+int
+_rl_abort_internal(void)
+{
+ el_beep(e);
+ longjmp(topbuf, 1);
+ /*NOTREACHED*/
+}
+
+int
+_rl_qsort_string_compare(char **s1, char **s2)
+{
+ return strcoll(*s1, *s2);
+}
+
+int
+/*ARGSUSED*/
+rl_kill_text(int from, int to)
+{
+ return 0;
+}
+
+Keymap
+rl_make_bare_keymap(void)
+{
+ return NULL;
+}
+
+Keymap
+rl_get_keymap(void)
+{
+ return NULL;
+}
+
+void
+/*ARGSUSED*/
+rl_set_keymap(Keymap k)
+{
+}
+
+int
+/*ARGSUSED*/
+rl_generic_bind(int type, const char * keyseq, const char * data, Keymap k)
+{
+ return 0;
+}
+
+int
+/*ARGSUSED*/
+rl_bind_key_in_map(int key, Function *fun, Keymap k)
+{
+ return 0;
+}
+
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libedit-20061022-2.9/src/shlib_version new/libedit-20061228-2.10/src/shlib_version
--- old/libedit-20061022-2.9/src/shlib_version 2006-10-22 15:25:36.000000000 +0200
+++ new/libedit-20061228-2.10/src/shlib_version 2006-12-28 21:52:36.000000000 +0100
@@ -1,5 +1,5 @@
-# $NetBSD: shlib_version,v 1.15 2003/12/05 13:37:48 lukem Exp $
+# $NetBSD: shlib_version,v 1.16 2006/11/24 00:01:17 christos Exp $
# Remember to update distrib/sets/lists/base/shl.* when changing
#
major=2
-minor=9
+minor=10
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libedit-20061022-2.9/src/term.c new/libedit-20061228-2.10/src/term.c
--- old/libedit-20061022-2.9/src/term.c 2006-10-22 15:25:36.000000000 +0200
+++ new/libedit-20061228-2.10/src/term.c 2006-12-28 21:52:36.000000000 +0100
@@ -1,4 +1,4 @@
-/* $NetBSD: term.c,v 1.45 2006/03/18 19:23:14 christos Exp $ */
+/* $NetBSD: term.c,v 1.46 2006/11/24 00:01:17 christos Exp $ */
/*-
* Copyright (c) 1992, 1993
@@ -37,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)term.c 8.2 (Berkeley) 4/30/95";
#else
-__RCSID("$NetBSD: term.c,v 1.45 2006/03/18 19:23:14 christos Exp $");
+__RCSID("$NetBSD: term.c,v 1.46 2006/11/24 00:01:17 christos Exp $");
#endif
#endif /* not lint && not SCCSID */
@@ -1327,7 +1327,7 @@
const char *what, *how;
if (argv == NULL || argv[1] == NULL || argv[2] == NULL)
- return (-1);
+ return -1;
what = argv[1];
how = argv[2];
@@ -1342,7 +1342,7 @@
if (ts->name != NULL) {
term_alloc(el, ts, how);
term_setflags(el);
- return (0);
+ return 0;
}
/*
* Do the numeric ones second
@@ -1351,46 +1351,100 @@
if (strcmp(tv->name, what) == 0)
break;
- if (tv->name != NULL) {
- if (tv == &tval[T_pt] || tv == &tval[T_km] ||
- tv == &tval[T_am] || tv == &tval[T_xn]) {
- if (strcmp(how, "yes") == 0)
- el->el_term.t_val[tv - tval] = 1;
- else if (strcmp(how, "no") == 0)
- el->el_term.t_val[tv - tval] = 0;
- else {
- (void) fprintf(el->el_errfile,
- "settc: Bad value `%s'.\n", how);
- return (-1);
- }
- term_setflags(el);
- if (term_change_size(el, Val(T_li), Val(T_co)) == -1)
- return (-1);
- return (0);
- } else {
- long i;
- char *ep;
+ if (tv->name != NULL)
+ return -1;
- i = strtol(how, &ep, 10);
- if (*ep != '\0') {
- (void) fprintf(el->el_errfile,
- "settc: Bad value `%s'.\n", how);
- return (-1);
- }
- el->el_term.t_val[tv - tval] = (int) i;
- el->el_term.t_size.v = Val(T_co);
- el->el_term.t_size.h = Val(T_li);
- if (tv == &tval[T_co] || tv == &tval[T_li])
- if (term_change_size(el, Val(T_li), Val(T_co))
- == -1)
- return (-1);
- return (0);
+ if (tv == &tval[T_pt] || tv == &tval[T_km] ||
+ tv == &tval[T_am] || tv == &tval[T_xn]) {
+ if (strcmp(how, "yes") == 0)
+ el->el_term.t_val[tv - tval] = 1;
+ else if (strcmp(how, "no") == 0)
+ el->el_term.t_val[tv - tval] = 0;
+ else {
+ (void) fprintf(el->el_errfile,
+ "%s: Bad value `%s'.\n", argv[0], how);
+ return -1;
}
+ term_setflags(el);
+ if (term_change_size(el, Val(T_li), Val(T_co)) == -1)
+ return -1;
+ return 0;
+ } else {
+ long i;
+ char *ep;
+
+ i = strtol(how, &ep, 10);
+ if (*ep != '\0') {
+ (void) fprintf(el->el_errfile,
+ "%s: Bad value `%s'.\n", argv[0], how);
+ return -1;
+ }
+ el->el_term.t_val[tv - tval] = (int) i;
+ el->el_term.t_size.v = Val(T_co);
+ el->el_term.t_size.h = Val(T_li);
+ if (tv == &tval[T_co] || tv == &tval[T_li])
+ if (term_change_size(el, Val(T_li), Val(T_co))
+ == -1)
+ return -1;
+ return 0;
}
- return (-1);
}
+/* term_gettc():
+ * Get the current terminal characteristics
+ */
+protected int
+/*ARGSUSED*/
+term_gettc(EditLine *el, int argc __attribute__((__unused__)), char **argv)
+{
+ const struct termcapstr *ts;
+ const struct termcapval *tv;
+ char *what;
+ void *how;
+
+ if (argv == NULL || argv[1] == NULL || argv[2] == NULL)
+ return (-1);
+
+ what = argv[1];
+ how = argv[2];
+
+ /*
+ * Do the strings first
+ */
+ for (ts = tstr; ts->name != NULL; ts++)
+ if (strcmp(ts->name, what) == 0)
+ break;
+
+ if (ts->name != NULL) {
+ *(char **)how = el->el_term.t_str[ts - tstr];
+ return 0;
+ }
+ /*
+ * Do the numeric ones second
+ */
+ for (tv = tval; tv->name != NULL; tv++)
+ if (strcmp(tv->name, what) == 0)
+ break;
+
+ if (tv->name == NULL)
+ return -1;
+
+ if (tv == &tval[T_pt] || tv == &tval[T_km] ||
+ tv == &tval[T_am] || tv == &tval[T_xn]) {
+ static char yes[] = "yes";
+ static char no[] = "no";
+ if (el->el_term.t_val[tv - tval])
+ *(char **)how = yes;
+ else
+ *(char **)how = no;
+ return 0;
+ } else {
+ *(int *)how = el->el_term.t_val[tv - tval];
+ return 0;
+ }
+}
+
/* term_echotc():
* Print the termcap string out with variable substitution
*/
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org