Deleted Added
sdiff udiff text old ( 84260 ) new ( 148834 )
full compact
tc1.c (84260) tc1.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

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

38#ifndef lint
39__COPYRIGHT("@(#) Copyright (c) 1992, 1993\n\
40 The Regents of the University of California. All rights reserved.\n");
41#endif /* not lint */
42
43#if !defined(lint) && !defined(SCCSID)
44static char sccsid[] = "@(#)test.c 8.1 (Berkeley) 6/4/93";
45#endif /* not lint && not SCCSID */
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

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

34#ifndef lint
35__COPYRIGHT("@(#) Copyright (c) 1992, 1993\n\
36 The Regents of the University of California. All rights reserved.\n");
37#endif /* not lint */
38
39#if !defined(lint) && !defined(SCCSID)
40static char sccsid[] = "@(#)test.c 8.1 (Berkeley) 6/4/93";
41#endif /* not lint && not SCCSID */
46__RCSID("$NetBSD: test.c,v 1.8 1999/09/21 00:07:03 lukem Exp $");
47__FBSDID("$FreeBSD: head/lib/libedit/TEST/test.c 84260 2001-10-01 08:41:27Z obrien $");
42__RCSID("$NetBSD: test.c,v 1.18 2005/06/01 11:37:52 lukem Exp $");
43__FBSDID("$FreeBSD: head/lib/libedit/TEST/test.c 148834 2005-08-07 20:55:59Z stefanf $");
48
49/*
50 * test.c: A little test program
51 */
52#include "sys.h"
53#include <stdio.h>
54#include <string.h>
55#include <signal.h>
56#include <sys/wait.h>
57#include <ctype.h>
58#include <stdlib.h>
59#include <unistd.h>
60#include <dirent.h>
61
62#include "histedit.h"
44
45/*
46 * test.c: A little test program
47 */
48#include "sys.h"
49#include <stdio.h>
50#include <string.h>
51#include <signal.h>
52#include <sys/wait.h>
53#include <ctype.h>
54#include <stdlib.h>
55#include <unistd.h>
56#include <dirent.h>
57
58#include "histedit.h"
63#include "tokenizer.h"
64
65static int continuation = 0;
59
60static int continuation = 0;
66static EditLine *el = NULL;
61volatile sig_atomic_t gotsig = 0;
67
62
68static u_char complete(EditLine *, int);
63static unsigned char complete(EditLine *, int);
69 int main(int, char **);
70static char *prompt(EditLine *);
71static void sig(int);
72
73static char *
74prompt(EditLine *el)
75{
64 int main(int, char **);
65static char *prompt(EditLine *);
66static void sig(int);
67
68static char *
69prompt(EditLine *el)
70{
76 static char a[] = "Edit$";
77 static char b[] = "Edit>";
71 static char a[] = "Edit$ ";
72 static char b[] = "Edit> ";
78
79 return (continuation ? b : a);
80}
81
82static void
83sig(int i)
84{
73
74 return (continuation ? b : a);
75}
76
77static void
78sig(int i)
79{
85
86 (void) fprintf(stderr, "Got signal %d.\n", i);
87 el_reset(el);
80 gotsig = i;
88}
89
90static unsigned char
91complete(EditLine *el, int ch)
92{
93 DIR *dd = opendir(".");
94 struct dirent *dp;
95 const char* ptr;
96 const LineInfo *lf = el_line(el);
97 int len;
98
99 /*
100 * Find the last word
101 */
81}
82
83static unsigned char
84complete(EditLine *el, int ch)
85{
86 DIR *dd = opendir(".");
87 struct dirent *dp;
88 const char* ptr;
89 const LineInfo *lf = el_line(el);
90 int len;
91
92 /*
93 * Find the last word
94 */
102 for (ptr = lf->cursor - 1; !isspace(*ptr) && ptr > lf->buffer; ptr--)
95 for (ptr = lf->cursor - 1;
96 !isspace((unsigned char)*ptr) && ptr > lf->buffer; ptr--)
103 continue;
104 len = lf->cursor - ++ptr;
105
106 for (dp = readdir(dd); dp != NULL; dp = readdir(dd)) {
107 if (len > strlen(dp->d_name))
108 continue;
109 if (strncmp(dp->d_name, ptr, len) == 0) {
110 closedir(dd);

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

117
118 closedir(dd);
119 return (CC_ERROR);
120}
121
122int
123main(int argc, char *argv[])
124{
97 continue;
98 len = lf->cursor - ++ptr;
99
100 for (dp = readdir(dd); dp != NULL; dp = readdir(dd)) {
101 if (len > strlen(dp->d_name))
102 continue;
103 if (strncmp(dp->d_name, ptr, len) == 0) {
104 closedir(dd);

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

111
112 closedir(dd);
113 return (CC_ERROR);
114}
115
116int
117main(int argc, char *argv[])
118{
119 EditLine *el = NULL;
125 int num;
126 const char *buf;
127 Tokenizer *tok;
120 int num;
121 const char *buf;
122 Tokenizer *tok;
128 int lastevent = 0, ncontinuation;
123#if 0
124 int lastevent = 0;
125#endif
126 int ncontinuation;
129 History *hist;
130 HistEvent ev;
131
132 (void) signal(SIGINT, sig);
133 (void) signal(SIGQUIT, sig);
134 (void) signal(SIGHUP, sig);
135 (void) signal(SIGTERM, sig);
136

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

164 el_set(el, EL_BIND, "-a", "j", "ed-next-line", NULL);
165
166 /*
167 * Source the user's defaults file.
168 */
169 el_source(el, NULL);
170
171 while ((buf = el_gets(el, &num)) != NULL && num != 0) {
127 History *hist;
128 HistEvent ev;
129
130 (void) signal(SIGINT, sig);
131 (void) signal(SIGQUIT, sig);
132 (void) signal(SIGHUP, sig);
133 (void) signal(SIGTERM, sig);
134

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

162 el_set(el, EL_BIND, "-a", "j", "ed-next-line", NULL);
163
164 /*
165 * Source the user's defaults file.
166 */
167 el_source(el, NULL);
168
169 while ((buf = el_gets(el, &num)) != NULL && num != 0) {
172 int ac;
173 char **av;
170 int ac, cc, co;
174#ifdef DEBUG
171#ifdef DEBUG
175 (void) fprintf(stderr, "got %d %s", num, buf);
172 int i;
176#endif
173#endif
174 const char **av;
175 const LineInfo *li;
176 li = el_line(el);
177#ifdef DEBUG
178 (void) fprintf(stderr, "==> got %d %s", num, buf);
179 (void) fprintf(stderr, " > li `%.*s_%.*s'\n",
180 (li->cursor - li->buffer), li->buffer,
181 (li->lastchar - 1 - li->cursor),
182 (li->cursor >= li->lastchar) ? "" : li->cursor);
183
184#endif
185 if (gotsig) {
186 (void) fprintf(stderr, "Got signal %d.\n", gotsig);
187 gotsig = 0;
188 el_reset(el);
189 }
190
177 if (!continuation && num == 1)
178 continue;
179
191 if (!continuation && num == 1)
192 continue;
193
180 if (tok_line(tok, buf, &ac, &av) > 0)
181 ncontinuation = 1;
182
194 ac = cc = co = 0;
195 ncontinuation = tok_line(tok, li, &ac, &av, &cc, &co);
196 if (ncontinuation < 0) {
197 (void) fprintf(stderr, "Internal error\n");
198 continuation = 0;
199 continue;
200 }
201#ifdef DEBUG
202 (void) fprintf(stderr, " > nc %d ac %d cc %d co %d\n",
203 ncontinuation, ac, cc, co);
204#endif
183#if 0
184 if (continuation) {
185 /*
186 * Append to the right event in case the user
187 * moved around in history.
188 */
189 if (history(hist, &ev, H_SET, lastevent) == -1)
205#if 0
206 if (continuation) {
207 /*
208 * Append to the right event in case the user
209 * moved around in history.
210 */
211 if (history(hist, &ev, H_SET, lastevent) == -1)
190 err(1, "%d: %s\n", lastevent, ev.str);
212 err(1, "%d: %s", lastevent, ev.str);
191 history(hist, &ev, H_ADD , buf);
192 } else {
193 history(hist, &ev, H_ENTER, buf);
194 lastevent = ev.num;
195 }
196#else
197 /* Simpler */
198 history(hist, &ev, continuation ? H_APPEND : H_ENTER, buf);
199#endif
200
201 continuation = ncontinuation;
202 ncontinuation = 0;
213 history(hist, &ev, H_ADD , buf);
214 } else {
215 history(hist, &ev, H_ENTER, buf);
216 lastevent = ev.num;
217 }
218#else
219 /* Simpler */
220 history(hist, &ev, continuation ? H_APPEND : H_ENTER, buf);
221#endif
222
223 continuation = ncontinuation;
224 ncontinuation = 0;
225 if (continuation)
226 continue;
227#ifdef DEBUG
228 for (i = 0; i < ac; i++) {
229 (void) fprintf(stderr, " > arg# %2d ", i);
230 if (i != cc)
231 (void) fprintf(stderr, "`%s'\n", av[i]);
232 else
233 (void) fprintf(stderr, "`%.*s_%s'\n",
234 co, av[i], av[i] + co);
235 }
236#endif
203
204 if (strcmp(av[0], "history") == 0) {
205 int rv;
206
207 switch (ac) {
208 case 1:
209 for (rv = history(hist, &ev, H_LAST); rv != -1;
210 rv = history(hist, &ev, H_PREV))

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

230 default:
231 (void) fprintf(stderr,
232 "Bad history arguments\n");
233 break;
234 }
235 } else if (el_parse(el, ac, av) == -1) {
236 switch (fork()) {
237 case 0:
237
238 if (strcmp(av[0], "history") == 0) {
239 int rv;
240
241 switch (ac) {
242 case 1:
243 for (rv = history(hist, &ev, H_LAST); rv != -1;
244 rv = history(hist, &ev, H_PREV))

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

264 default:
265 (void) fprintf(stderr,
266 "Bad history arguments\n");
267 break;
268 }
269 } else if (el_parse(el, ac, av) == -1) {
270 switch (fork()) {
271 case 0:
238 execvp(av[0], av);
272 execvp(av[0], __DECONST(char *const *, av));
239 perror(av[0]);
240 _exit(1);
241 /*NOTREACHED*/
242 break;
243
244 case -1:
245 perror("fork");
246 break;

--- 18 unchanged lines hidden --- 		273 perror(av[0]);
274 _exit(1);
275 /*NOTREACHED*/
276 break;
277
278 case -1:
279 perror("fork");
280 break;

--- 18 unchanged lines hidden ---