Deleted Added
sdiff udiff text old ( 84334 ) new ( 148834 )
full compact
parse.c (84334) parse.c (148834)
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
9 * modification, are permitted provided that the following conditions
10 * are met:
11 * 1. Redistributions of source code must retain the above copyright
12 * notice, this list of conditions and the following disclaimer.
13 * 2. Redistributions in binary form must reproduce the above copyright
14 * notice, this list of conditions and the following disclaimer in the
15 * documentation and/or other materials provided with the distribution.
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
9 * modification, are permitted provided that the following conditions
10 * are met:
11 * 1. Redistributions of source code must retain the above copyright
12 * notice, this list of conditions and the following disclaimer.
13 * 2. Redistributions in binary form must reproduce the above copyright
14 * notice, this list of conditions and the following disclaimer in the
15 * documentation and/or other materials provided with the distribution.
16 * 3. All advertising materials mentioning features or use of this software
17 * must display the following acknowledgement:
18 * This product includes software developed by the University of
19 * California, Berkeley and its contributors.
20 * 4. Neither the name of the University nor the names of its contributors
16 * 3. Neither the name of the University nor the names of its contributors
21 * may be used to endorse or promote products derived from this software
22 * without specific prior written permission.
23 *
24 * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
25 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
26 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
27 * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
28 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
29 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
30 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
31 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
32 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
33 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
34 * SUCH DAMAGE.
35 *
17 * may be used to endorse or promote products derived from this software
18 * without specific prior written permission.
19 *
20 * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
21 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
22 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
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.
31 *
36 * $NetBSD: parse.c,v 1.13 2000/09/04 22:06:31 lukem Exp $
32 * $NetBSD: parse.c,v 1.22 2005/05/29 04:58:15 lukem Exp $
37 */
38
39#if !defined(lint) && !defined(SCCSID)
40static char sccsid[] = "@(#)parse.c 8.1 (Berkeley) 6/4/93";
41#endif /* not lint && not SCCSID */
42#include <sys/cdefs.h>
33 */
34
35#if !defined(lint) && !defined(SCCSID)
36static char sccsid[] = "@(#)parse.c 8.1 (Berkeley) 6/4/93";
37#endif /* not lint && not SCCSID */
38#include <sys/cdefs.h>
43__FBSDID("$FreeBSD: head/lib/libedit/parse.c 84334 2001-10-01 23:00:29Z obrien $");
39__FBSDID("$FreeBSD: head/lib/libedit/parse.c 148834 2005-08-07 20:55:59Z stefanf $");
44
45/*
46 * parse.c: parse an editline extended command
47 *
48 * commands are:
49 *
50 * bind
51 * echotc
52 * edit
53 * gettc
54 * history
55 * settc
56 * setty
57 */
58#include "sys.h"
59#include "el.h"
40
41/*
42 * parse.c: parse an editline extended command
43 *
44 * commands are:
45 *
46 * bind
47 * echotc
48 * edit
49 * gettc
50 * history
51 * settc
52 * setty
53 */
54#include "sys.h"
55#include "el.h"
60#include "tokenizer.h"
61#include <stdlib.h>
62
63private const struct {
56#include <stdlib.h>
57
58private const struct {
64 char *name;
65 int (*func)(EditLine *, int, char **);
59 const char *name;
60 int (*func)(EditLine *, int, const char **);
66} cmds[] = {
67 { "bind", map_bind },
68 { "echotc", term_echotc },
69 { "edit", el_editmode },
61} cmds[] = {
62 { "bind", map_bind },
63 { "echotc", term_echotc },
64 { "edit", el_editmode },
70 { "history", hist_list },
65 { "history", hist_command },
71 { "telltc", term_telltc },
72 { "settc", term_settc },
73 { "setty", tty_stty },
74 { NULL, NULL }
75};
76
77
78/* parse_line():
79 * Parse a line and dispatch it
80 */
81protected int
82parse_line(EditLine *el, const char *line)
83{
66 { "telltc", term_telltc },
67 { "settc", term_settc },
68 { "setty", tty_stty },
69 { NULL, NULL }
70};
71
72
73/* parse_line():
74 * Parse a line and dispatch it
75 */
76protected int
77parse_line(EditLine *el, const char *line)
78{
84 char **argv;
79 const char **argv;
85 int argc;
86 Tokenizer *tok;
87
88 tok = tok_init(NULL);
80 int argc;
81 Tokenizer *tok;
82
83 tok = tok_init(NULL);
89 tok_line(tok, line, &argc, &argv);
84 tok_str(tok, line, &argc, &argv);
90 argc = el_parse(el, argc, argv);
91 tok_end(tok);
92 return (argc);
93}
94
95
96/* el_parse():
97 * Command dispatcher
98 */
99public int
85 argc = el_parse(el, argc, argv);
86 tok_end(tok);
87 return (argc);
88}
89
90
91/* el_parse():
92 * Command dispatcher
93 */
94public int
100el_parse(EditLine *el, int argc, char *argv[])
95el_parse(EditLine *el, int argc, const char *argv[])
101{
96{
102 char *ptr;
97 const char *ptr;
103 int i;
104
105 if (argc < 1)
106 return (-1);
107 ptr = strchr(argv[0], ':');
108 if (ptr != NULL) {
109 char *tprog;
110 size_t l;

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

134}
135
136
137/* parse__escape():
138 * Parse a string of the form ^<char> \<odigit> \<char> and return
139 * the appropriate character or -1 if the escape is not valid
140 */
141protected int
98 int i;
99
100 if (argc < 1)
101 return (-1);
102 ptr = strchr(argv[0], ':');
103 if (ptr != NULL) {
104 char *tprog;
105 size_t l;

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

129}
130
131
132/* parse__escape():
133 * Parse a string of the form ^<char> \<odigit> \<char> and return
134 * the appropriate character or -1 if the escape is not valid
135 */
136protected int
142parse__escape(const char **const ptr)
137parse__escape(const char **ptr)
143{
144 const char *p;
145 int c;
146
147 p = *ptr;
148
149 if (p[1] == 0)
150 return (-1);

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

199 return (-1);
200 --p;
201 break;
202 }
203 default:
204 c = *p;
205 break;
206 }
138{
139 const char *p;
140 int c;
141
142 p = *ptr;
143
144 if (p[1] == 0)
145 return (-1);

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

194 return (-1);
195 --p;
196 break;
197 }
198 default:
199 c = *p;
200 break;
201 }
207 } else if (*p == '^' && isascii(p[1]) && (p[1] == '?' || isalpha(p[1]))) {
202 } else if (*p == '^') {
208 p++;
209 c = (*p == '?') ? '\177' : (*p & 0237);
210 } else
211 c = *p;
212 *ptr = ++p;
213 return ((unsigned char)c);
214}
203 p++;
204 c = (*p == '?') ? '\177' : (*p & 0237);
205 } else
206 c = *p;
207 *ptr = ++p;
208 return ((unsigned char)c);
209}
210
215/* parse__string():
216 * Parse the escapes from in and put the raw string out
217 */
218protected char *
219parse__string(char *out, const char *in)
220{
221 char *rv = out;
222 int n;

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

229
230 case '\\':
231 case '^':
232 if ((n = parse__escape(&in)) == -1)
233 return (NULL);
234 *out++ = n;
235 break;
236
211/* parse__string():
212 * Parse the escapes from in and put the raw string out
213 */
214protected char *
215parse__string(char *out, const char *in)
216{
217 char *rv = out;
218 int n;

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

225
226 case '\\':
227 case '^':
228 if ((n = parse__escape(&in)) == -1)
229 return (NULL);
230 *out++ = n;
231 break;
232
233 case 'M':
234 if (in[1] == '-' && in[2] != '\0') {
235 *out++ = '\033';
236 in += 2;
237 break;
238 }
239 /*FALLTHROUGH*/
240
237 default:
238 *out++ = *in++;
239 break;
240 }
241}
242
243
244/* parse_cmd():

--- 13 unchanged lines hidden --- 		241 default:
242 *out++ = *in++;
243 break;
244 }
245}
246
247
248/* parse_cmd():

--- 13 unchanged lines hidden ---