From owner-svn-src-all@FreeBSD.ORG Mon Apr 4 16:23:33 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1ED92106566B; Mon, 4 Apr 2011 16:23:33 +0000 (UTC) (envelope-from obrien@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 048C78FC1F; Mon, 4 Apr 2011 16:23:33 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p34GNWiR088806; Mon, 4 Apr 2011 16:23:32 GMT (envelope-from obrien@svn.freebsd.org) Received: (from obrien@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p34GNWxI088802; Mon, 4 Apr 2011 16:23:32 GMT (envelope-from obrien@svn.freebsd.org) Message-Id: <201104041623.p34GNWxI088802@svn.freebsd.org> From: "David E. O'Brien" Date: Mon, 4 Apr 2011 16:23:32 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-vendor@freebsd.org X-SVN-Group: vendor MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r220329 - in vendor/NetBSD/libedit/dist: . readline X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 04 Apr 2011 16:23:33 -0000 Author: obrien Date: Mon Apr 4 16:23:32 2011 New Revision: 220329 URL: http://svn.freebsd.org/changeset/base/220329 Log: Vendor import NetBSD's libedit of "2010/08/04 20:29:18 UTC". Obtained from: NetBSD Modified: vendor/NetBSD/libedit/dist/read.c vendor/NetBSD/libedit/dist/readline.c vendor/NetBSD/libedit/dist/readline/readline.h Modified: vendor/NetBSD/libedit/dist/read.c ============================================================================== --- vendor/NetBSD/libedit/dist/read.c Mon Apr 4 16:23:01 2011 (r220328) +++ vendor/NetBSD/libedit/dist/read.c Mon Apr 4 16:23:32 2011 (r220329) @@ -1,4 +1,4 @@ -/* $NetBSD: read.c,v 1.55 2010/03/22 22:59:06 christos Exp $ */ +/* $NetBSD: read.c,v 1.57 2010/07/21 18:18:52 christos Exp $ */ /*- * Copyright (c) 1992, 1993 @@ -37,7 +37,7 @@ #if 0 static char sccsid[] = "@(#)read.c 8.1 (Berkeley) 6/4/93"; #else -__RCSID("$NetBSD: read.c,v 1.55 2010/03/22 22:59:06 christos Exp $"); +__RCSID("$NetBSD: read.c,v 1.57 2010/07/21 18:18:52 christos Exp $"); #endif #endif /* not lint && not SCCSID */ @@ -321,10 +321,15 @@ read_char(EditLine *el, Char *cp) again: el->el_signal->sig_no = 0; while ((num_read = read(el->el_infd, cbuf + cbp, 1)) == -1) { - if (el->el_signal->sig_no == SIGCONT) { - sig_set(el); + switch (el->el_signal->sig_no) { + case SIGCONT: el_set(el, EL_REFRESH); + /*FALLTHROUGH*/ + case SIGWINCH: + sig_set(el); goto again; + default: + break; } if (!tried && read__fixio(el->el_infd, errno) == 0) tried = 1; Modified: vendor/NetBSD/libedit/dist/readline.c ============================================================================== --- vendor/NetBSD/libedit/dist/readline.c Mon Apr 4 16:23:01 2011 (r220328) +++ vendor/NetBSD/libedit/dist/readline.c Mon Apr 4 16:23:32 2011 (r220329) @@ -1,4 +1,4 @@ -/* $NetBSD: readline.c,v 1.89 2010/04/15 00:57:33 christos Exp $ */ +/* $NetBSD: readline.c,v 1.90 2010/08/04 20:29:18 christos Exp $ */ /*- * Copyright (c) 1997 The NetBSD Foundation, Inc. @@ -31,7 +31,7 @@ #include "config.h" #if !defined(lint) && !defined(SCCSID) -__RCSID("$NetBSD: readline.c,v 1.89 2010/04/15 00:57:33 christos Exp $"); +__RCSID("$NetBSD: readline.c,v 1.90 2010/08/04 20:29:18 christos Exp $"); #endif /* not lint && not SCCSID */ #include @@ -2234,3 +2234,9 @@ void rl_cleanup_after_signal(void) { } + +int +rl_on_new_line(void) +{ + return 0; +} Modified: vendor/NetBSD/libedit/dist/readline/readline.h ============================================================================== --- vendor/NetBSD/libedit/dist/readline/readline.h Mon Apr 4 16:23:01 2011 (r220328) +++ vendor/NetBSD/libedit/dist/readline/readline.h Mon Apr 4 16:23:32 2011 (r220329) @@ -1,4 +1,4 @@ -/* $NetBSD: readline.h,v 1.30 2009/09/07 21:24:34 christos Exp $ */ +/* $NetBSD: readline.h,v 1.31 2010/08/04 20:29:18 christos Exp $ */ /*- * Copyright (c) 1997 The NetBSD Foundation, Inc. @@ -202,6 +202,7 @@ int _rl_qsort_string_compare(char **, char **rl_completion_matches(const char *, rl_compentry_func_t *); void rl_forced_update_display(void); int rl_set_prompt(const char *); +int rl_on_new_line(void); /* * The following are not implemented