Deleted Added
full compact
search.c (225736) search.c (237738)
1/*-
2 * Copyright (c) 1992, 1993
3 * The Regents of the University of California. All rights reserved.
4 *
5 * This code is derived from software contributed to Berkeley by
6 * Christos Zoulas of Cornell University.
7 *
8 * Redistribution and use in source and binary forms, with or without

--- 15 unchanged lines hidden (view full) ---

24 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
25 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
26 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
27 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
28 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
29 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
30 * SUCH DAMAGE.
31 *
1/*-
2 * Copyright (c) 1992, 1993
3 * The Regents of the University of California. All rights reserved.
4 *
5 * This code is derived from software contributed to Berkeley by
6 * Christos Zoulas of Cornell University.
7 *
8 * Redistribution and use in source and binary forms, with or without

--- 15 unchanged lines hidden (view full) ---

24 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
25 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
26 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
27 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
28 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
29 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
30 * SUCH DAMAGE.
31 *
32 * $NetBSD: search.c,v 1.20 2004/11/04 01:16:03 christos Exp $
32 * $NetBSD: search.c,v 1.21 2009/02/15 21:55:23 christos Exp $
33 */
34
35#if !defined(lint) && !defined(SCCSID)
36static char sccsid[] = "@(#)search.c 8.1 (Berkeley) 6/4/93";
37#endif /* not lint && not SCCSID */
38#include <sys/cdefs.h>
33 */
34
35#if !defined(lint) && !defined(SCCSID)
36static char sccsid[] = "@(#)search.c 8.1 (Berkeley) 6/4/93";
37#endif /* not lint && not SCCSID */
38#include <sys/cdefs.h>
39__FBSDID("$FreeBSD: stable/9/lib/libedit/search.c 148834 2005-08-07 20:55:59Z stefanf $");
39__FBSDID("$FreeBSD: stable/9/lib/libedit/search.c 237738 2012-06-29 03:01:38Z pfg $");
40
41/*
42 * search.c: History and character search functions
43 */
44#include "sys.h"
45#include <stdlib.h>
46#if defined(REGEX)
47#include <regex.h>

--- 154 unchanged lines hidden (view full) ---

202 static char pchar = ':';/* ':' = normal, '?' = failed */
203 static char endcmd[2] = {'\0', '\0'};
204 char ch, *ocursor = el->el_line.cursor, oldpchar = pchar;
205 const char *cp;
206
207 el_action_t ret = CC_NORM;
208
209 int ohisteventno = el->el_history.eventno;
40
41/*
42 * search.c: History and character search functions
43 */
44#include "sys.h"
45#include <stdlib.h>
46#if defined(REGEX)
47#include <regex.h>

--- 154 unchanged lines hidden (view full) ---

202 static char pchar = ':';/* ':' = normal, '?' = failed */
203 static char endcmd[2] = {'\0', '\0'};
204 char ch, *ocursor = el->el_line.cursor, oldpchar = pchar;
205 const char *cp;
206
207 el_action_t ret = CC_NORM;
208
209 int ohisteventno = el->el_history.eventno;
210 int oldpatlen = el->el_search.patlen;
210 size_t oldpatlen = el->el_search.patlen;
211 int newdir = dir;
212 int done, redo;
213
214 if (el->el_line.lastchar + sizeof(STRfwd) / sizeof(char) + 2 +
215 el->el_search.patlen >= el->el_line.limit)
216 return (CC_ERROR);
217
218 for (;;) {

--- 413 unchanged lines hidden ---
211 int newdir = dir;
212 int done, redo;
213
214 if (el->el_line.lastchar + sizeof(STRfwd) / sizeof(char) + 2 +
215 el->el_search.patlen >= el->el_line.limit)
216 return (CC_ERROR);
217
218 for (;;) {

--- 413 unchanged lines hidden ---