Deleted Added
sdiff udiff text old ( 237448 ) new ( 276881 )
full compact
search.c (237448) search.c (276881)
1/* $NetBSD: search.c,v 1.30 2011/10/04 15:27:04 christos Exp $ */
2
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

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

23 * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
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.
3/*-
4 * Copyright (c) 1992, 1993
5 * The Regents of the University of California. All rights reserved.
6 *
7 * This code is derived from software contributed to Berkeley by
8 * Christos Zoulas of Cornell University.
9 *
10 * Redistribution and use in source and binary forms, with or without

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

25 * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
26 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
27 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
28 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
29 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
30 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
31 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
32 * SUCH DAMAGE.
31 *
32 * $NetBSD: search.c,v 1.21 2009/02/15 21:55:23 christos Exp $
33 */
34
33 */
34
35#include "config.h"
35#if !defined(lint) && !defined(SCCSID)
36#if !defined(lint) && !defined(SCCSID)
37#if 0
36static char sccsid[] = "@(#)search.c 8.1 (Berkeley) 6/4/93";
38static char sccsid[] = "@(#)search.c 8.1 (Berkeley) 6/4/93";
39#else
40__RCSID("$NetBSD: search.c,v 1.30 2011/10/04 15:27:04 christos Exp $");
41#endif
37#endif /* not lint && not SCCSID */
38#include <sys/cdefs.h>
42#endif /* not lint && not SCCSID */
43#include <sys/cdefs.h>
39__FBSDID("$FreeBSD: head/lib/libedit/search.c 237448 2012-06-22 18:01:22Z pfg $");
44__FBSDID("$FreeBSD: head/lib/libedit/search.c 276881 2015-01-09 07:40:56Z bapt $");
40
41/*
42 * search.c: History and character search functions
43 */
45
46/*
47 * search.c: History and character search functions
48 */
44#include "sys.h"
45#include <stdlib.h>
46#if defined(REGEX)
47#include <regex.h>
48#elif defined(REGEXP)
49#include <regexp.h>
50#endif
51#include "el.h"
52

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

59
60/* search_init():
61 * Initialize the search stuff
62 */
63protected int
64search_init(EditLine *el)
65{
66
49#include <stdlib.h>
50#if defined(REGEX)
51#include <regex.h>
52#elif defined(REGEXP)
53#include <regexp.h>
54#endif
55#include "el.h"
56

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

63
64/* search_init():
65 * Initialize the search stuff
66 */
67protected int
68search_init(EditLine *el)
69{
70
67 el->el_search.patbuf = (char *) el_malloc(EL_BUFSIZ);
71 el->el_search.patbuf = el_malloc(EL_BUFSIZ *
72 sizeof(*el->el_search.patbuf));
68 if (el->el_search.patbuf == NULL)
73 if (el->el_search.patbuf == NULL)
69 return (-1);
74 return -1;
70 el->el_search.patlen = 0;
71 el->el_search.patdir = -1;
72 el->el_search.chacha = '\0';
73 el->el_search.chadir = CHAR_FWD;
74 el->el_search.chatflg = 0;
75 el->el_search.patlen = 0;
76 el->el_search.patdir = -1;
77 el->el_search.chacha = '\0';
78 el->el_search.chadir = CHAR_FWD;
79 el->el_search.chatflg = 0;
75 return (0);
80 return 0;
76}
77
78
79/* search_end():
80 * Initialize the search stuff
81 */
82protected void
83search_end(EditLine *el)
84{
85
81}
82
83
84/* search_end():
85 * Initialize the search stuff
86 */
87protected void
88search_end(EditLine *el)
89{
90
86 el_free((ptr_t) el->el_search.patbuf);
91 el_free(el->el_search.patbuf);
87 el->el_search.patbuf = NULL;
88}
89
90
91#ifdef REGEXP
92/* regerror():
93 * Handle regular expression errors
94 */

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

99}
100#endif
101
102
103/* el_match():
104 * Return if string matches pattern
105 */
106protected int
92 el->el_search.patbuf = NULL;
93}
94
95
96#ifdef REGEXP
97/* regerror():
98 * Handle regular expression errors
99 */

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

104}
105#endif
106
107
108/* el_match():
109 * Return if string matches pattern
110 */
111protected int
107el_match(const char *str, const char *pat)
112el_match(const Char *str, const Char *pat)
108{
113{
114#ifdef WIDECHAR
115 static ct_buffer_t conv;
116#endif
109#if defined (REGEX)
110 regex_t re;
111 int rv;
112#elif defined (REGEXP)
113 regexp *rp;
114 int rv;
115#else
116 extern char *re_comp(const char *);
117 extern int re_exec(const char *);
118#endif
119
117#if defined (REGEX)
118 regex_t re;
119 int rv;
120#elif defined (REGEXP)
121 regexp *rp;
122 int rv;
123#else
124 extern char *re_comp(const char *);
125 extern int re_exec(const char *);
126#endif
127
120 if (strstr(str, pat) != NULL)
121 return (1);
128 if (Strstr(str, pat) != 0)
129 return 1;
122
123#if defined(REGEX)
130
131#if defined(REGEX)
124 if (regcomp(&re, pat, 0) == 0) {
125 rv = regexec(&re, str, 0, NULL, 0) == 0;
132 if (regcomp(&re, ct_encode_string(pat, &conv), 0) == 0) {
133 rv = regexec(&re, ct_encode_string(str, &conv), (size_t)0, NULL,
134 0) == 0;
126 regfree(&re);
127 } else {
128 rv = 0;
129 }
135 regfree(&re);
136 } else {
137 rv = 0;
138 }
130 return (rv);
139 return rv;
131#elif defined(REGEXP)
140#elif defined(REGEXP)
132 if ((re = regcomp(pat)) != NULL) {
133 rv = regexec(re, str);
134 free((ptr_t) re);
141 if ((re = regcomp(ct_encode_string(pat, &conv))) != NULL) {
142 rv = regexec(re, ct_encode_string(str, &conv));
143 el_free(re);
135 } else {
136 rv = 0;
137 }
144 } else {
145 rv = 0;
146 }
138 return (rv);
147 return rv;
139#else
148#else
140 if (re_comp(pat) != NULL)
141 return (0);
149 if (re_comp(ct_encode_string(pat, &conv)) != NULL)
150 return 0;
142 else
151 else
143 return (re_exec(str) == 1);
152 return re_exec(ct_encode_string(str, &conv) == 1);
144#endif
145}
146
147
148/* c_hmatch():
149 * return True if the pattern matches the prefix
150 */
151protected int
153#endif
154}
155
156
157/* c_hmatch():
158 * return True if the pattern matches the prefix
159 */
160protected int
152c_hmatch(EditLine *el, const char *str)
161c_hmatch(EditLine *el, const Char *str)
153{
154#ifdef SDEBUG
155 (void) fprintf(el->el_errfile, "match `%s' with `%s'\n",
156 el->el_search.patbuf, str);
157#endif /* SDEBUG */
158
162{
163#ifdef SDEBUG
164 (void) fprintf(el->el_errfile, "match `%s' with `%s'\n",
165 el->el_search.patbuf, str);
166#endif /* SDEBUG */
167
159 return (el_match(str, el->el_search.patbuf));
168 return el_match(str, el->el_search.patbuf);
160}
161
162
163/* c_setpat():
164 * Set the history seatch pattern
165 */
166protected void
167c_setpat(EditLine *el)
168{
169 if (el->el_state.lastcmd != ED_SEARCH_PREV_HISTORY &&
170 el->el_state.lastcmd != ED_SEARCH_NEXT_HISTORY) {
169}
170
171
172/* c_setpat():
173 * Set the history seatch pattern
174 */
175protected void
176c_setpat(EditLine *el)
177{
178 if (el->el_state.lastcmd != ED_SEARCH_PREV_HISTORY &&
179 el->el_state.lastcmd != ED_SEARCH_NEXT_HISTORY) {
171 el->el_search.patlen = EL_CURSOR(el) - el->el_line.buffer;
180 el->el_search.patlen =
181 (size_t)(EL_CURSOR(el) - el->el_line.buffer);
172 if (el->el_search.patlen >= EL_BUFSIZ)
173 el->el_search.patlen = EL_BUFSIZ - 1;
174 if (el->el_search.patlen != 0) {
182 if (el->el_search.patlen >= EL_BUFSIZ)
183 el->el_search.patlen = EL_BUFSIZ - 1;
184 if (el->el_search.patlen != 0) {
175 (void) strncpy(el->el_search.patbuf, el->el_line.buffer,
185 (void) Strncpy(el->el_search.patbuf, el->el_line.buffer,
176 el->el_search.patlen);
177 el->el_search.patbuf[el->el_search.patlen] = '\0';
178 } else
186 el->el_search.patlen);
187 el->el_search.patbuf[el->el_search.patlen] = '\0';
188 } else
179 el->el_search.patlen = strlen(el->el_search.patbuf);
189 el->el_search.patlen = Strlen(el->el_search.patbuf);
180 }
181#ifdef SDEBUG
182 (void) fprintf(el->el_errfile, "\neventno = %d\n",
183 el->el_history.eventno);
184 (void) fprintf(el->el_errfile, "patlen = %d\n", el->el_search.patlen);
185 (void) fprintf(el->el_errfile, "patbuf = \"%s\"\n",
186 el->el_search.patbuf);
187 (void) fprintf(el->el_errfile, "cursor %d lastchar %d\n",

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

192
193
194/* ce_inc_search():
195 * Emacs incremental search
196 */
197protected el_action_t
198ce_inc_search(EditLine *el, int dir)
199{
190 }
191#ifdef SDEBUG
192 (void) fprintf(el->el_errfile, "\neventno = %d\n",
193 el->el_history.eventno);
194 (void) fprintf(el->el_errfile, "patlen = %d\n", el->el_search.patlen);
195 (void) fprintf(el->el_errfile, "patbuf = \"%s\"\n",
196 el->el_search.patbuf);
197 (void) fprintf(el->el_errfile, "cursor %d lastchar %d\n",

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

202
203
204/* ce_inc_search():
205 * Emacs incremental search
206 */
207protected el_action_t
208ce_inc_search(EditLine *el, int dir)
209{
200 static const char STRfwd[] = {'f', 'w', 'd', '\0'},
210 static const Char STRfwd[] = {'f', 'w', 'd', '\0'},
201 STRbck[] = {'b', 'c', 'k', '\0'};
211 STRbck[] = {'b', 'c', 'k', '\0'};
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;
212 static Char pchar = ':';/* ':' = normal, '?' = failed */
213 static Char endcmd[2] = {'\0', '\0'};
214 Char ch, *ocursor = el->el_line.cursor, oldpchar = pchar;
215 const Char *cp;
206
207 el_action_t ret = CC_NORM;
208
209 int ohisteventno = el->el_history.eventno;
210 size_t oldpatlen = el->el_search.patlen;
211 int newdir = dir;
212 int done, redo;
213
216
217 el_action_t ret = CC_NORM;
218
219 int ohisteventno = el->el_history.eventno;
220 size_t oldpatlen = el->el_search.patlen;
221 int newdir = dir;
222 int done, redo;
223
214 if (el->el_line.lastchar + sizeof(STRfwd) / sizeof(char) + 2 +
224 if (el->el_line.lastchar + sizeof(STRfwd) /
225 sizeof(*el->el_line.lastchar) + 2 +
215 el->el_search.patlen >= el->el_line.limit)
226 el->el_search.patlen >= el->el_line.limit)
216 return (CC_ERROR);
227 return CC_ERROR;
217
218 for (;;) {
219
220 if (el->el_search.patlen == 0) { /* first round */
221 pchar = ':';
222#ifdef ANCHOR
223#define LEN 2
224 el->el_search.patbuf[el->el_search.patlen++] = '.';

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

235 *el->el_line.lastchar++ = pchar;
236 for (cp = &el->el_search.patbuf[LEN];
237 cp < &el->el_search.patbuf[el->el_search.patlen];
238 *el->el_line.lastchar++ = *cp++)
239 continue;
240 *el->el_line.lastchar = '\0';
241 re_refresh(el);
242
228
229 for (;;) {
230
231 if (el->el_search.patlen == 0) { /* first round */
232 pchar = ':';
233#ifdef ANCHOR
234#define LEN 2
235 el->el_search.patbuf[el->el_search.patlen++] = '.';

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

246 *el->el_line.lastchar++ = pchar;
247 for (cp = &el->el_search.patbuf[LEN];
248 cp < &el->el_search.patbuf[el->el_search.patlen];
249 *el->el_line.lastchar++ = *cp++)
250 continue;
251 *el->el_line.lastchar = '\0';
252 re_refresh(el);
253
243 if (el_getc(el, &ch) != 1)
244 return (ed_end_of_file(el, 0));
254 if (FUN(el,getc)(el, &ch) != 1)
255 return ed_end_of_file(el, 0);
245
246 switch (el->el_map.current[(unsigned char) ch]) {
247 case ED_INSERT:
248 case ED_DIGIT:
249 if (el->el_search.patlen >= EL_BUFSIZ - LEN)
256
257 switch (el->el_map.current[(unsigned char) ch]) {
258 case ED_INSERT:
259 case ED_DIGIT:
260 if (el->el_search.patlen >= EL_BUFSIZ - LEN)
250 term_beep(el);
261 terminal_beep(el);
251 else {
252 el->el_search.patbuf[el->el_search.patlen++] =
253 ch;
254 *el->el_line.lastchar++ = ch;
255 *el->el_line.lastchar = '\0';
256 re_refresh(el);
257 }
258 break;

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

267 redo++;
268 break;
269
270 case EM_DELETE_PREV_CHAR:
271 case ED_DELETE_PREV_CHAR:
272 if (el->el_search.patlen > LEN)
273 done++;
274 else
262 else {
263 el->el_search.patbuf[el->el_search.patlen++] =
264 ch;
265 *el->el_line.lastchar++ = ch;
266 *el->el_line.lastchar = '\0';
267 re_refresh(el);
268 }
269 break;

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

278 redo++;
279 break;
280
281 case EM_DELETE_PREV_CHAR:
282 case ED_DELETE_PREV_CHAR:
283 if (el->el_search.patlen > LEN)
284 done++;
285 else
275 term_beep(el);
286 terminal_beep(el);
276 break;
277
278 default:
279 switch (ch) {
280 case 0007: /* ^G: Abort */
281 ret = CC_ERROR;
282 done++;
283 break;

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

291 el->el_search.patlen - LEN - 1;
292 cp = c__next_word(el->el_line.cursor,
293 el->el_line.lastchar, 1,
294 ce__isword);
295 while (el->el_line.cursor < cp &&
296 *el->el_line.cursor != '\n') {
297 if (el->el_search.patlen >=
298 EL_BUFSIZ - LEN) {
287 break;
288
289 default:
290 switch (ch) {
291 case 0007: /* ^G: Abort */
292 ret = CC_ERROR;
293 done++;
294 break;

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

302 el->el_search.patlen - LEN - 1;
303 cp = c__next_word(el->el_line.cursor,
304 el->el_line.lastchar, 1,
305 ce__isword);
306 while (el->el_line.cursor < cp &&
307 *el->el_line.cursor != '\n') {
308 if (el->el_search.patlen >=
309 EL_BUFSIZ - LEN) {
299 term_beep(el);
310 terminal_beep(el);
300 break;
301 }
302 el->el_search.patbuf[el->el_search.patlen++] =
303 *el->el_line.cursor;
304 *el->el_line.lastchar++ =
305 *el->el_line.cursor++;
306 }
307 el->el_line.cursor = ocursor;
308 *el->el_line.lastchar = '\0';
309 re_refresh(el);
310 break;
311 } else if (isglob(*cp)) {
311 break;
312 }
313 el->el_search.patbuf[el->el_search.patlen++] =
314 *el->el_line.cursor;
315 *el->el_line.lastchar++ =
316 *el->el_line.cursor++;
317 }
318 el->el_line.cursor = ocursor;
319 *el->el_line.lastchar = '\0';
320 re_refresh(el);
321 break;
322 } else if (isglob(*cp)) {
312 term_beep(el);
323 terminal_beep(el);
313 break;
314 }
315 break;
316
317 default: /* Terminate and execute cmd */
318 endcmd[0] = ch;
324 break;
325 }
326 break;
327
328 default: /* Terminate and execute cmd */
329 endcmd[0] = ch;
319 el_push(el, endcmd);
330 FUN(el,push)(el, endcmd);
320 /* FALLTHROUGH */
321
322 case 0033: /* ESC: Terminate */
323 ret = CC_REFRESH;
324 done++;
325 break;
326 }
327 break;

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

373 '\0';
374 if (el->el_line.cursor < el->el_line.buffer ||
375 el->el_line.cursor > el->el_line.lastchar ||
376 (ret = ce_search_line(el, newdir))
377 == CC_ERROR) {
378 /* avoid c_setpat */
379 el->el_state.lastcmd =
380 (el_action_t) newdir;
331 /* FALLTHROUGH */
332
333 case 0033: /* ESC: Terminate */
334 ret = CC_REFRESH;
335 done++;
336 break;
337 }
338 break;

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

384 '\0';
385 if (el->el_line.cursor < el->el_line.buffer ||
386 el->el_line.cursor > el->el_line.lastchar ||
387 (ret = ce_search_line(el, newdir))
388 == CC_ERROR) {
389 /* avoid c_setpat */
390 el->el_state.lastcmd =
391 (el_action_t) newdir;
381 ret = newdir == ED_SEARCH_PREV_HISTORY ?
392 ret = (el_action_t)
393 (newdir == ED_SEARCH_PREV_HISTORY ?
382 ed_search_prev_history(el, 0) :
394 ed_search_prev_history(el, 0) :
383 ed_search_next_history(el, 0);
395 ed_search_next_history(el, 0));
384 if (ret != CC_ERROR) {
385 el->el_line.cursor = newdir ==
386 ED_SEARCH_PREV_HISTORY ?
387 el->el_line.lastchar :
388 el->el_line.buffer;
389 (void) ce_search_line(el,
390 newdir);
391 }
392 }
393 el->el_search.patlen -= LEN;
394 el->el_search.patbuf[el->el_search.patlen] =
395 '\0';
396 if (ret == CC_ERROR) {
396 if (ret != CC_ERROR) {
397 el->el_line.cursor = newdir ==
398 ED_SEARCH_PREV_HISTORY ?
399 el->el_line.lastchar :
400 el->el_line.buffer;
401 (void) ce_search_line(el,
402 newdir);
403 }
404 }
405 el->el_search.patlen -= LEN;
406 el->el_search.patbuf[el->el_search.patlen] =
407 '\0';
408 if (ret == CC_ERROR) {
397 term_beep(el);
409 terminal_beep(el);
398 if (el->el_history.eventno !=
399 ohisteventno) {
400 el->el_history.eventno =
401 ohisteventno;
402 if (hist_get(el) == CC_ERROR)
410 if (el->el_history.eventno !=
411 ohisteventno) {
412 el->el_history.eventno =
413 ohisteventno;
414 if (hist_get(el) == CC_ERROR)
403 return (CC_ERROR);
415 return CC_ERROR;
404 }
405 el->el_line.cursor = ocursor;
406 pchar = '?';
407 } else {
408 pchar = ':';
409 }
410 }
411 ret = ce_inc_search(el, newdir);

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

420 }
421 if (ret == CC_NORM || (ret == CC_ERROR && oldpatlen == 0)) {
422 /* restore on normal return or error exit */
423 pchar = oldpchar;
424 el->el_search.patlen = oldpatlen;
425 if (el->el_history.eventno != ohisteventno) {
426 el->el_history.eventno = ohisteventno;
427 if (hist_get(el) == CC_ERROR)
416 }
417 el->el_line.cursor = ocursor;
418 pchar = '?';
419 } else {
420 pchar = ':';
421 }
422 }
423 ret = ce_inc_search(el, newdir);

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

432 }
433 if (ret == CC_NORM || (ret == CC_ERROR && oldpatlen == 0)) {
434 /* restore on normal return or error exit */
435 pchar = oldpchar;
436 el->el_search.patlen = oldpatlen;
437 if (el->el_history.eventno != ohisteventno) {
438 el->el_history.eventno = ohisteventno;
439 if (hist_get(el) == CC_ERROR)
428 return (CC_ERROR);
440 return CC_ERROR;
429 }
430 el->el_line.cursor = ocursor;
431 if (ret == CC_ERROR)
432 re_refresh(el);
433 }
434 if (done || ret != CC_NORM)
441 }
442 el->el_line.cursor = ocursor;
443 if (ret == CC_ERROR)
444 re_refresh(el);
445 }
446 if (done || ret != CC_NORM)
435 return (ret);
447 return ret;
436 }
437}
438
439
440/* cv_search():
441 * Vi search.
442 */
443protected el_action_t
444cv_search(EditLine *el, int dir)
445{
448 }
449}
450
451
452/* cv_search():
453 * Vi search.
454 */
455protected el_action_t
456cv_search(EditLine *el, int dir)
457{
446 char ch;
447 char tmpbuf[EL_BUFSIZ];
448 int tmplen;
458 Char ch;
459 Char tmpbuf[EL_BUFSIZ];
460 ssize_t tmplen;
449
450#ifdef ANCHOR
451 tmpbuf[0] = '.';
452 tmpbuf[1] = '*';
453#endif
454 tmplen = LEN;
455
456 el->el_search.patdir = dir;
457
458 tmplen = c_gets(el, &tmpbuf[LEN],
461
462#ifdef ANCHOR
463 tmpbuf[0] = '.';
464 tmpbuf[1] = '*';
465#endif
466 tmplen = LEN;
467
468 el->el_search.patdir = dir;
469
470 tmplen = c_gets(el, &tmpbuf[LEN],
459 dir == ED_SEARCH_PREV_HISTORY ? "\n/" : "\n?" );
471 dir == ED_SEARCH_PREV_HISTORY ? STR("\n/") : STR("\n?") );
460 if (tmplen == -1)
461 return CC_REFRESH;
462
463 tmplen += LEN;
464 ch = tmpbuf[tmplen];
465 tmpbuf[tmplen] = '\0';
466
467 if (tmplen == LEN) {
468 /*
469 * Use the old pattern, but wild-card it.
470 */
471 if (el->el_search.patlen == 0) {
472 re_refresh(el);
472 if (tmplen == -1)
473 return CC_REFRESH;
474
475 tmplen += LEN;
476 ch = tmpbuf[tmplen];
477 tmpbuf[tmplen] = '\0';
478
479 if (tmplen == LEN) {
480 /*
481 * Use the old pattern, but wild-card it.
482 */
483 if (el->el_search.patlen == 0) {
484 re_refresh(el);
473 return (CC_ERROR);
485 return CC_ERROR;
474 }
475#ifdef ANCHOR
476 if (el->el_search.patbuf[0] != '.' &&
477 el->el_search.patbuf[0] != '*') {
486 }
487#ifdef ANCHOR
488 if (el->el_search.patbuf[0] != '.' &&
489 el->el_search.patbuf[0] != '*') {
478 (void) strncpy(tmpbuf, el->el_search.patbuf,
479 sizeof(tmpbuf) - 1);
490 (void) Strncpy(tmpbuf, el->el_search.patbuf,
491 sizeof(tmpbuf) / sizeof(*tmpbuf) - 1);
480 el->el_search.patbuf[0] = '.';
481 el->el_search.patbuf[1] = '*';
492 el->el_search.patbuf[0] = '.';
493 el->el_search.patbuf[1] = '*';
482 (void) strncpy(&el->el_search.patbuf[2], tmpbuf,
494 (void) Strncpy(&el->el_search.patbuf[2], tmpbuf,
483 EL_BUFSIZ - 3);
484 el->el_search.patlen++;
485 el->el_search.patbuf[el->el_search.patlen++] = '.';
486 el->el_search.patbuf[el->el_search.patlen++] = '*';
487 el->el_search.patbuf[el->el_search.patlen] = '\0';
488 }
489#endif
490 } else {
491#ifdef ANCHOR
492 tmpbuf[tmplen++] = '.';
493 tmpbuf[tmplen++] = '*';
494#endif
495 tmpbuf[tmplen] = '\0';
495 EL_BUFSIZ - 3);
496 el->el_search.patlen++;
497 el->el_search.patbuf[el->el_search.patlen++] = '.';
498 el->el_search.patbuf[el->el_search.patlen++] = '*';
499 el->el_search.patbuf[el->el_search.patlen] = '\0';
500 }
501#endif
502 } else {
503#ifdef ANCHOR
504 tmpbuf[tmplen++] = '.';
505 tmpbuf[tmplen++] = '*';
506#endif
507 tmpbuf[tmplen] = '\0';
496 (void) strncpy(el->el_search.patbuf, tmpbuf, EL_BUFSIZ - 1);
497 el->el_search.patlen = tmplen;
508 (void) Strncpy(el->el_search.patbuf, tmpbuf, EL_BUFSIZ - 1);
509 el->el_search.patlen = (size_t)tmplen;
498 }
499 el->el_state.lastcmd = (el_action_t) dir; /* avoid c_setpat */
500 el->el_line.cursor = el->el_line.lastchar = el->el_line.buffer;
501 if ((dir == ED_SEARCH_PREV_HISTORY ? ed_search_prev_history(el, 0) :
502 ed_search_next_history(el, 0)) == CC_ERROR) {
503 re_refresh(el);
510 }
511 el->el_state.lastcmd = (el_action_t) dir; /* avoid c_setpat */
512 el->el_line.cursor = el->el_line.lastchar = el->el_line.buffer;
513 if ((dir == ED_SEARCH_PREV_HISTORY ? ed_search_prev_history(el, 0) :
514 ed_search_next_history(el, 0)) == CC_ERROR) {
515 re_refresh(el);
504 return (CC_ERROR);
516 return CC_ERROR;
505 }
506 if (ch == 0033) {
507 re_refresh(el);
508 return ed_newline(el, 0);
509 }
517 }
518 if (ch == 0033) {
519 re_refresh(el);
520 return ed_newline(el, 0);
521 }
510 return (CC_REFRESH);
522 return CC_REFRESH;
511}
512
513
514/* ce_search_line():
515 * Look for a pattern inside a line
516 */
517protected el_action_t
518ce_search_line(EditLine *el, int dir)
519{
523}
524
525
526/* ce_search_line():
527 * Look for a pattern inside a line
528 */
529protected el_action_t
530ce_search_line(EditLine *el, int dir)
531{
520 char *cp = el->el_line.cursor;
521 char *pattern = el->el_search.patbuf;
522 char oc, *ocp;
532 Char *cp = el->el_line.cursor;
533 Char *pattern = el->el_search.patbuf;
534 Char oc, *ocp;
523#ifdef ANCHOR
524 ocp = &pattern[1];
525 oc = *ocp;
526 *ocp = '^';
527#else
528 ocp = pattern;
529 oc = *ocp;
530#endif
531
532 if (dir == ED_SEARCH_PREV_HISTORY) {
533 for (; cp >= el->el_line.buffer; cp--) {
534 if (el_match(cp, ocp)) {
535 *ocp = oc;
536 el->el_line.cursor = cp;
535#ifdef ANCHOR
536 ocp = &pattern[1];
537 oc = *ocp;
538 *ocp = '^';
539#else
540 ocp = pattern;
541 oc = *ocp;
542#endif
543
544 if (dir == ED_SEARCH_PREV_HISTORY) {
545 for (; cp >= el->el_line.buffer; cp--) {
546 if (el_match(cp, ocp)) {
547 *ocp = oc;
548 el->el_line.cursor = cp;
537 return (CC_NORM);
549 return CC_NORM;
538 }
539 }
540 *ocp = oc;
550 }
551 }
552 *ocp = oc;
541 return (CC_ERROR);
553 return CC_ERROR;
542 } else {
543 for (; *cp != '\0' && cp < el->el_line.limit; cp++) {
544 if (el_match(cp, ocp)) {
545 *ocp = oc;
546 el->el_line.cursor = cp;
554 } else {
555 for (; *cp != '\0' && cp < el->el_line.limit; cp++) {
556 if (el_match(cp, ocp)) {
557 *ocp = oc;
558 el->el_line.cursor = cp;
547 return (CC_NORM);
559 return CC_NORM;
548 }
549 }
550 *ocp = oc;
560 }
561 }
562 *ocp = oc;
551 return (CC_ERROR);
563 return CC_ERROR;
552 }
553}
554
555
556/* cv_repeat_srch():
557 * Vi repeat search
558 */
559protected el_action_t
564 }
565}
566
567
568/* cv_repeat_srch():
569 * Vi repeat search
570 */
571protected el_action_t
560cv_repeat_srch(EditLine *el, int c)
572cv_repeat_srch(EditLine *el, Int c)
561{
562
563#ifdef SDEBUG
564 (void) fprintf(el->el_errfile, "dir %d patlen %d patbuf %s\n",
573{
574
575#ifdef SDEBUG
576 (void) fprintf(el->el_errfile, "dir %d patlen %d patbuf %s\n",
565 c, el->el_search.patlen, el->el_search.patbuf);
577 c, el->el_search.patlen, ct_encode_string(el->el_search.patbuf));
566#endif
567
568 el->el_state.lastcmd = (el_action_t) c; /* Hack to stop c_setpat */
569 el->el_line.lastchar = el->el_line.buffer;
570
571 switch (c) {
572 case ED_SEARCH_NEXT_HISTORY:
578#endif
579
580 el->el_state.lastcmd = (el_action_t) c; /* Hack to stop c_setpat */
581 el->el_line.lastchar = el->el_line.buffer;
582
583 switch (c) {
584 case ED_SEARCH_NEXT_HISTORY:
573 return (ed_search_next_history(el, 0));
585 return ed_search_next_history(el, 0);
574 case ED_SEARCH_PREV_HISTORY:
586 case ED_SEARCH_PREV_HISTORY:
575 return (ed_search_prev_history(el, 0));
587 return ed_search_prev_history(el, 0);
576 default:
588 default:
577 return (CC_ERROR);
589 return CC_ERROR;
578 }
579}
580
581
582/* cv_csearch():
583 * Vi character search
584 */
585protected el_action_t
590 }
591}
592
593
594/* cv_csearch():
595 * Vi character search
596 */
597protected el_action_t
586cv_csearch(EditLine *el, int direction, int ch, int count, int tflag)
598cv_csearch(EditLine *el, int direction, Int ch, int count, int tflag)
587{
599{
588 char *cp;
600 Char *cp;
589
590 if (ch == 0)
591 return CC_ERROR;
592
601
602 if (ch == 0)
603 return CC_ERROR;
604
593 if (ch == -1) {
594 char c;
595 if (el_getc(el, &c) != 1)
605 if (ch == (Int)-1) {
606 Char c;
607 if (FUN(el,getc)(el, &c) != 1)
596 return ed_end_of_file(el, 0);
597 ch = c;
598 }
599
600 /* Save for ';' and ',' commands */
601 el->el_search.chacha = ch;
602 el->el_search.chadir = direction;
608 return ed_end_of_file(el, 0);
609 ch = c;
610 }
611
612 /* Save for ';' and ',' commands */
613 el->el_search.chacha = ch;
614 el->el_search.chadir = direction;
603 el->el_search.chatflg = tflag;
615 el->el_search.chatflg = (char)tflag;
604
605 cp = el->el_line.cursor;
606 while (count--) {
616
617 cp = el->el_line.cursor;
618 while (count--) {
607 if (*cp == ch)
619 if ((Int)*cp == ch)
608 cp += direction;
609 for (;;cp += direction) {
610 if (cp >= el->el_line.lastchar)
611 return CC_ERROR;
612 if (cp < el->el_line.buffer)
613 return CC_ERROR;
620 cp += direction;
621 for (;;cp += direction) {
622 if (cp >= el->el_line.lastchar)
623 return CC_ERROR;
624 if (cp < el->el_line.buffer)
625 return CC_ERROR;
614 if (*cp == ch)
626 if ((Int)*cp == ch)
615 break;
616 }
617 }
618
619 if (tflag)
620 cp -= direction;
621
622 el->el_line.cursor = cp;
623
624 if (el->el_chared.c_vcmd.action != NOP) {
625 if (direction > 0)
626 el->el_line.cursor++;
627 cv_delfini(el);
628 return CC_REFRESH;
629 }
630 return CC_CURSOR;
631}
627 break;
628 }
629 }
630
631 if (tflag)
632 cp -= direction;
633
634 el->el_line.cursor = cp;
635
636 if (el->el_chared.c_vcmd.action != NOP) {
637 if (direction > 0)
638 el->el_line.cursor++;
639 cv_delfini(el);
640 return CC_REFRESH;
641 }
642 return CC_CURSOR;
643}