Annotation of OpenXM_contrib2/fep/fep+NetBSD-OpenXM.diff, Revision 1.2
1.2 ! noro 1: diff -cr fep.orig/Makefile fep/Makefile
! 2: *** fep.orig/Makefile Wed Sep 18 18:48:24 2002
! 3: --- fep/Makefile Tue Sep 3 09:41:43 2002
1.1 noro 4: ***************
5: *** 25,35 ****
6: #DEBUG = -O
7:
8: CFLAGS += $(DEBUG) $(CONFIG)
9: - .if exists(/usr/lib/libcompat.a)
10: - LDFLAGS = -ltermcap -lcompat
11: - .else
12: LDFLAGS = -ltermcap
13: - .endif
14:
15: all: $(TARGET)
16:
17: --- 25,31 ----
1.2 ! noro 18: Only in fep: fep
! 19: Only in fep: fep+NetBSD-OpenXM.diff
! 20: diff -cr fep.orig/fep_alias.c fep/fep_alias.c
! 21: *** fep.orig/fep_alias.c Wed Sep 18 18:48:25 2002
! 22: --- fep/fep_alias.c Tue Sep 3 09:41:44 2002
1.1 noro 23: ***************
24: *** 3,9 ****
25: #ifndef lint
26: static char rcsid[]=
27: "$Header: fep_alias.c,v 4.2 88/11/13 15:50:52 utashiro Exp $ (SRA)";
28: ! #endif lint
29:
30: #include <stdio.h>
31: #include <ctype.h>
32: --- 3,9 ----
33: #ifndef lint
34: static char rcsid[]=
35: "$Header: fep_alias.c,v 4.2 88/11/13 15:50:52 utashiro Exp $ (SRA)";
36: ! #endif /* lint */
37:
38: #include <stdio.h>
39: #include <ctype.h>
1.2 ! noro 40: Only in fep: fep_alias.o
! 41: diff -cr fep.orig/fep_com.c fep/fep_com.c
! 42: *** fep.orig/fep_com.c Wed Sep 18 18:48:26 2002
! 43: --- fep/fep_com.c Wed Sep 18 18:44:20 2002
1.1 noro 44: ***************
45: *** 3,15 ****
46: #ifndef lint
47: static char rcsid[]=
48: "$Header: fep_com.c,v 4.9 91/05/29 14:30:43 utashiro Exp $ (SRA)";
49: ! #endif lint
50:
51: #include <stdio.h>
52: #include <sys/ioctl.h>
53: #ifdef TERMIOS
54: #include <termios.h>
55: ! #ifdef __linux__
56: #ifndef _POSIX_VDISABLE
57: #define _POSIX_VDISABLE '\0'
58: #endif
59: --- 3,15 ----
60: #ifndef lint
61: static char rcsid[]=
62: "$Header: fep_com.c,v 4.9 91/05/29 14:30:43 utashiro Exp $ (SRA)";
63: ! #endif /* lint */
64:
65: #include <stdio.h>
66: #include <sys/ioctl.h>
67: #ifdef TERMIOS
68: #include <termios.h>
69: ! #if defined(__linux__) || defined(__CYGWIN__)
70: #ifndef _POSIX_VDISABLE
71: #define _POSIX_VDISABLE '\0'
72: #endif
1.2 ! noro 73: ***************
! 74: *** 22,27 ****
! 75: --- 22,30 ----
! 76: #include <sys/file.h>
! 77: #include <sys/stat.h>
! 78: #include <sys/ioctl.h>
! 79: + #if defined(sun)
! 80: + #include <sys/fcntl.h>
! 81: + #endif
! 82: #include "fep_defs.h"
! 83: #include "fep_glob.h"
! 84: #include "fep_funcs.h"
! 85: Only in fep: fep_com.o
! 86: diff -cr fep.orig/fep_defs.h fep/fep_defs.h
! 87: *** fep.orig/fep_defs.h Wed Sep 18 18:48:27 2002
! 88: --- fep/fep_defs.h Tue Sep 3 09:41:44 2002
1.1 noro 89: ***************
90: *** 3,9 ****
91: #ifndef lint
92: # define FEP_DEFS \
93: "$Header: /home/mmb/utashiro/src/fep/RCS/fep_defs.h,v 4.3 1989/01/06 10:07:29 utashiro Exp $ (SRA)"
94: ! #endif lint
95:
96: #define MAXCMDLEN 512 /* maximum command length */
97: #define MAXARGS 64 /* maximum number of arguments */
98: --- 3,9 ----
99: #ifndef lint
100: # define FEP_DEFS \
101: "$Header: /home/mmb/utashiro/src/fep/RCS/fep_defs.h,v 4.3 1989/01/06 10:07:29 utashiro Exp $ (SRA)"
102: ! #endif /* lint */
103:
104: #define MAXCMDLEN 512 /* maximum command length */
105: #define MAXARGS 64 /* maximum number of arguments */
106: ***************
107: *** 31,51 ****
108: # define isctlchar(c) (c && !iskanji(c) && (!(c&0140) || c=='\177'))
109: # define iswordchar(c) (c && (iskanji(c) || isalnum(c) || iscntrl(c)))
110: # define isWordchar(c) ((c) && !isspace((c)))
111: ! #else KANJI
112: # define isctlchar(c) (c && (!(c&0140) || c=='\177'))
113: # define iswordchar(c) (isalnum(c) || iscntrl(c))
114: # define isWordchar(c) ((c) && !isspace((c)))
115: ! #endif KANJI
116: #define unctl(c) (((c)=='\177') ? '?' : ((c) >= 040) ? (c) : (c)|0100)
117: #define toctrl(c) ((c)&~0100)
118: #define ctrl(c) ((c)&037)
119:
120: #define INDIRECTED (1<<(sizeof(char*)*8-1))
121: /* this is actually 0x80000000 on 32 bit machine,
122: that addresses kernel address space */
123: #define isIndirect(f) ((u_int)(f)&(u_int)INDIRECTED)
124: #define setIndirect(f) (FUNC)((u_int)(f)|(u_int)INDIRECTED)
125: #define maskIndirect(f) (FUNC *)((u_int)(f)&~(u_int)INDIRECTED)
126:
127: /*
128: * Type of character
129: --- 31,58 ----
130: # define isctlchar(c) (c && !iskanji(c) && (!(c&0140) || c=='\177'))
131: # define iswordchar(c) (c && (iskanji(c) || isalnum(c) || iscntrl(c)))
132: # define isWordchar(c) ((c) && !isspace((c)))
133: ! #else /* KANJI */
134: # define isctlchar(c) (c && (!(c&0140) || c=='\177'))
135: # define iswordchar(c) (isalnum(c) || iscntrl(c))
136: # define isWordchar(c) ((c) && !isspace((c)))
137: ! #endif /* KANJI */
138: #define unctl(c) (((c)=='\177') ? '?' : ((c) >= 040) ? (c) : (c)|0100)
139: #define toctrl(c) ((c)&~0100)
140: #define ctrl(c) ((c)&037)
141:
142: + #if defined(__alpha)
143: + #define INDIRECTED (((u_long)1)<<63)
144: + #define isIndirect(f) ((u_long)(f)&(u_long)INDIRECTED)
145: + #define setIndirect(f) (FUNC)((u_long)(f)|(u_long)INDIRECTED)
146: + #define maskIndirect(f) (FUNC *)((u_long)(f)&~(u_long)INDIRECTED)
147: + #else
148: #define INDIRECTED (1<<(sizeof(char*)*8-1))
149: /* this is actually 0x80000000 on 32 bit machine,
150: that addresses kernel address space */
151: #define isIndirect(f) ((u_int)(f)&(u_int)INDIRECTED)
152: #define setIndirect(f) (FUNC)((u_int)(f)|(u_int)INDIRECTED)
153: #define maskIndirect(f) (FUNC *)((u_int)(f)&~(u_int)INDIRECTED)
154: + #endif
155:
156: /*
157: * Type of character
158: ***************
159: *** 53,69 ****
160: #ifdef KANJI
161: # define CHAR unsigned char
162: # define CHARMASK 0377
163: ! #else KANJI
164: # define CHAR char
165: # define CHARMASK 0177
166: ! #endif KANJI
167:
168: /*
169: * Only one machine I know alloca() works is vax.
170: */
171: #ifdef vax
172: # define ALLOCA
173: ! #endif vax
174:
175: /*
176: * Typedef's
177: --- 60,76 ----
178: #ifdef KANJI
179: # define CHAR unsigned char
180: # define CHARMASK 0377
181: ! #else /* KANJI */
182: # define CHAR char
183: # define CHARMASK 0177
184: ! #endif /* KANJI */
185:
186: /*
187: * Only one machine I know alloca() works is vax.
188: */
189: #ifdef vax
190: # define ALLOCA
191: ! #endif /* vax */
192:
193: /*
194: * Typedef's
1.2 ! noro 195: diff -cr fep.orig/fep_edit.c fep/fep_edit.c
! 196: *** fep.orig/fep_edit.c Wed Sep 18 18:48:28 2002
! 197: --- fep/fep_edit.c Wed Sep 18 18:43:52 2002
1.1 noro 198: ***************
199: *** 3,9 ****
200: #ifndef lint
201: static char rcsid[]=
202: "$Id: fep_edit.c,v 4.10 1995/01/20 08:15:55 utashiro Exp $ (SRA)";
203: ! #endif lint
204:
205: #include <stdio.h>
206: #include <sys/types.h>
207: --- 3,9 ----
208: #ifndef lint
209: static char rcsid[]=
210: "$Id: fep_edit.c,v 4.10 1995/01/20 08:15:55 utashiro Exp $ (SRA)";
211: ! #endif /* lint */
212:
213: #include <stdio.h>
214: #include <sys/types.h>
215: ***************
216: *** 11,17 ****
217: #include <sys/ioctl.h>
218: #ifdef TERMIOS
219: #include <termios.h>
220: ! #ifdef __linux__
221: #ifndef _POSIX_VDISABLE
222: #define _POSIX_VDISABLE '\0'
223: #endif
224: --- 11,17 ----
225: #include <sys/ioctl.h>
226: #ifdef TERMIOS
227: #include <termios.h>
228: ! #if defined(__linux__) || defined(__CYGWIN__)
229: #ifndef _POSIX_VDISABLE
230: #define _POSIX_VDISABLE '\0'
231: #endif
232: ***************
233: *** 21,27 ****
1.2 ! noro 234: --- 21,36 ----
1.1 noro 235: #endif
236: #include <sys/time.h>
237: #include <ctype.h>
238: + #if defined(__CYGWIN__)
239: + #include <sys/dirent.h>
240: + #define direct dirent
1.2 ! noro 241: + #elif defined(sun)
! 242: + #include <dirent.h>
! 243: + #define direct dirent
! 244: + #include <unistd.h>
1.1 noro 245: + #else
246: #include <sys/dir.h>
247: + #endif
248: #include <sys/file.h>
249: #include <setjmp.h>
250: #include "fep_defs.h"
251: ***************
252: *** 207,213 ****
1.2 ! noro 253: --- 216,229 ----
1.1 noro 254: import (cft, initial_ttymode.c_cc[VSTART], ignore);
255: import (cft, initial_ttymode.c_cc[VSTOP], ignore);
256: */
257: + #if 0
258: import (cft, initial_ttymode.c_cc[VINTR], insert_and_flush);
259: + #else
260: + /* added by noro */
261: + import (cft, initial_ttymode.c_cc[VINTR], send_int_sig);
262: + /* XXX : this may not be necessary */
263: + import (aft, initial_ttymode.c_cc[VINTR], send_int_sig);
264: + #endif
265: import (cft, initial_ttymode.c_cc[VQUIT], insert_and_flush);
266: /* Now, EOF will be sent on empty line.
267: import (cft, initial_ttymode.c_cc[VEOF], send_eof);
268: ***************
269: *** 230,236 ****
1.2 ! noro 270: --- 246,257 ----
1.1 noro 271: import (cft, tchars_buf.t_startc, ignore);
272: import (cft, tchars_buf.t_stopc, ignore);
273: */
274: + #if 0
275: import (cft, tchars_buf.t_intrc, insert_and_flush);
276: + #else
277: + import (cft, tchars_buf.t_intrc, send_int_sig);
278: + import (aft, tchars_buf.t_intrc, send_int_sig);
279: + #endif
280: import (cft, tchars_buf.t_quitc, insert_and_flush);
281: /* Now, EOF will be sent on empty line.
282: import (cft, tchars_buf.t_eofc, send_eof);
283: ***************
284: *** 461,467 ****
285: register int i, nbyte = 1, currentNull;
286: #ifdef KANJI
287: CHAR byte2;
288: ! #endif KANJI
289:
290: currentNull = strlen (CommandLine);
291:
1.2 ! noro 292: --- 482,488 ----
1.1 noro 293: register int i, nbyte = 1, currentNull;
294: #ifdef KANJI
295: CHAR byte2;
296: ! #endif /* KANJI */
297:
298: currentNull = strlen (CommandLine);
299:
300: ***************
301: *** 480,486 ****
302: nbyte = 2;
303: }
304: else
305: ! #endif KANJI
306: putChar (c);
307: reverse_strcpy (
308: &CommandLine[CurrentPosition] + nbyte,
1.2 ! noro 309: --- 501,507 ----
1.1 noro 310: nbyte = 2;
311: }
312: else
313: ! #endif /* KANJI */
314: putChar (c);
315: reverse_strcpy (
316: &CommandLine[CurrentPosition] + nbyte,
317: ***************
318: *** 492,498 ****
319: if (nbyte > 1) {
320: CommandLine[CurrentPosition - 1] = byte2;
321: }
322: ! #endif KANJI
323: printS (&CommandLine [CurrentPosition]);
324:
325: if (CommandLine[CurrentPosition] != '\0') {
1.2 ! noro 326: --- 513,519 ----
1.1 noro 327: if (nbyte > 1) {
328: CommandLine[CurrentPosition - 1] = byte2;
329: }
330: ! #endif /* KANJI */
331: printS (&CommandLine [CurrentPosition]);
332:
333: if (CommandLine[CurrentPosition] != '\0') {
334: ***************
335: *** 596,602 ****
336: #ifdef KANJI
337: && !(CurrentPosition + 1 == position
338: && iskanji (CommandLine[CurrentPosition]))
339: ! #endif KANJI
340: )
341: (void) forward_n_character (1);
342: }
1.2 ! noro 343: --- 617,623 ----
1.1 noro 344: #ifdef KANJI
345: && !(CurrentPosition + 1 == position
346: && iskanji (CommandLine[CurrentPosition]))
347: ! #endif /* KANJI */
348: )
349: (void) forward_n_character (1);
350: }
351: ***************
352: *** 620,629 ****
353: #ifdef KANJI
354: #define INC(i) if(iskanji(CommandLine[i])) i+=2; else i++;
355: #define DEC(i) if(i>=2 && iskanji_in_string(CommandLine, i-2)) i-=2; else i--;
356: ! #else KANJI
357: #define INC(i) i++
358: #define DEC(i) i--
359: ! #endif KANJI
360:
361: /*
362: * Move cursor to end of line
1.2 ! noro 363: --- 641,650 ----
1.1 noro 364: #ifdef KANJI
365: #define INC(i) if(iskanji(CommandLine[i])) i+=2; else i++;
366: #define DEC(i) if(i>=2 && iskanji_in_string(CommandLine, i-2)) i-=2; else i--;
367: ! #else /* KANJI */
368: #define INC(i) i++
369: #define DEC(i) i--
370: ! #endif /* KANJI */
371:
372: /*
373: * Move cursor to end of line
374: ***************
375: *** 681,687 ****
376: i--;
377: }
378: else
379: ! #endif KANJI
380: putchar (BS);
381: i--;
382: }
1.2 ! noro 383: --- 702,708 ----
1.1 noro 384: i--;
385: }
386: else
387: ! #endif /* KANJI */
388: putchar (BS);
389: i--;
390: }
391: ***************
392: *** 736,742 ****
393: nchars++;
394: }
395: }
396: ! #else KANJI
397: while (n--) {
398: i--, nchars++;
399: while (i > 0 && !iswordchar (CommandLine [i])) {
1.2 ! noro 400: --- 757,763 ----
1.1 noro 401: nchars++;
402: }
403: }
404: ! #else /* KANJI */
405: while (n--) {
406: i--, nchars++;
407: while (i > 0 && !iswordchar (CommandLine [i])) {
408: ***************
409: *** 746,752 ****
410: i--, nchars++;
411: }
412: }
413: ! #endif KANJI
414: return (backward_n_character (nchars));
415: }
416:
1.2 ! noro 417: --- 767,773 ----
1.1 noro 418: i--, nchars++;
419: }
420: }
421: ! #endif /* KANJI */
422: return (backward_n_character (nchars));
423: }
424:
425: ***************
426: *** 797,803 ****
427: nchars++;
428: }
429: }
430: ! #else KANJI
431: while (n--) {
432: i--, nchars++;
433: while (i > 0 && !isWordchar (CommandLine [i]))
1.2 ! noro 434: --- 818,824 ----
1.1 noro 435: nchars++;
436: }
437: }
438: ! #else /* KANJI */
439: while (n--) {
440: i--, nchars++;
441: while (i > 0 && !isWordchar (CommandLine [i]))
442: ***************
443: *** 805,811 ****
444: while (i > 0 && isWordchar (CommandLine [i - 1]))
445: i--, nchars++;
446: }
447: ! #endif KANJI
448: return (backward_n_character (nchars));
449: }
450:
1.2 ! noro 451: --- 826,832 ----
1.1 noro 452: while (i > 0 && isWordchar (CommandLine [i - 1]))
453: i--, nchars++;
454: }
455: ! #endif /* KANJI */
456: return (backward_n_character (nchars));
457: }
458:
459: ***************
460: *** 843,849 ****
461: (void) putchar (CommandLine[i++]);
462: }
463: else
464: ! #endif KANJI
465: if (isctlchar(CommandLine[i])) {
466: (void) putchar (unctl (CommandLine [i]));
467: i++;
1.2 ! noro 468: --- 864,870 ----
1.1 noro 469: (void) putchar (CommandLine[i++]);
470: }
471: else
472: ! #endif /* KANJI */
473: if (isctlchar(CommandLine[i])) {
474: (void) putchar (unctl (CommandLine [i]));
475: i++;
476: ***************
477: *** 858,864 ****
478: (void) putchar (CommandLine[i++]);
479: }
480: else
481: ! #endif KANJI
482: putChar (CommandLine [i++]);
483: }
484:
1.2 ! noro 485: --- 879,885 ----
1.1 noro 486: (void) putchar (CommandLine[i++]);
487: }
488: else
489: ! #endif /* KANJI */
490: putChar (CommandLine [i++]);
491: }
492:
493: ***************
494: *** 1039,1047 ****
495: i -= 2, nbyte += 2;
496: else
497: i -= 1, nbyte += 1;
498: ! #else KANJI
499: nbyte = n;
500: ! #endif KANJI
501:
502: deleteArea = howlong (&CommandLine[CurrentPosition - nbyte], nbyte);
503: restArea = howlong (&CommandLine[CurrentPosition], 0);
1.2 ! noro 504: --- 1060,1068 ----
1.1 noro 505: i -= 2, nbyte += 2;
506: else
507: i -= 1, nbyte += 1;
508: ! #else /* KANJI */
509: nbyte = n;
510: ! #endif /* KANJI */
511:
512: deleteArea = howlong (&CommandLine[CurrentPosition - nbyte], nbyte);
513: restArea = howlong (&CommandLine[CurrentPosition], 0);
514: ***************
515: *** 1114,1120 ****
516: nchars++;
517: }
518: }
519: ! #else KANJI
520: while (n--) {
521: i--, nchars++;
522: while (i > 0 && !iswordchar (CommandLine [i]))
1.2 ! noro 523: --- 1135,1141 ----
1.1 noro 524: nchars++;
525: }
526: }
527: ! #else /* KANJI */
528: while (n--) {
529: i--, nchars++;
530: while (i > 0 && !iswordchar (CommandLine [i]))
531: ***************
532: *** 1122,1128 ****
533: while (i > 0 && iswordchar (CommandLine [i - 1]))
534: i--, nchars++;
535: }
536: ! #endif KANJI
537:
538: return (delete_previous_n_character (nchars));
539: }
1.2 ! noro 540: --- 1143,1149 ----
1.1 noro 541: while (i > 0 && iswordchar (CommandLine [i - 1]))
542: i--, nchars++;
543: }
544: ! #endif /* KANJI */
545:
546: return (delete_previous_n_character (nchars));
547: }
548: ***************
549: *** 1175,1181 ****
550: nchars++;
551: }
552: }
553: ! #else KANJI
554: while (n--) {
555: i--, nchars++;
556: while (i > 0 && !isWordchar (CommandLine [i]))
1.2 ! noro 557: --- 1196,1202 ----
1.1 noro 558: nchars++;
559: }
560: }
561: ! #else /* KANJI */
562: while (n--) {
563: i--, nchars++;
564: while (i > 0 && !isWordchar (CommandLine [i]))
565: ***************
566: *** 1183,1189 ****
567: while (i > 0 && isWordchar (CommandLine [i - 1]))
568: i--, nchars++;
569: }
570: ! #endif KANJI
571:
572: return (delete_previous_n_character (nchars));
573: }
1.2 ! noro 574: --- 1204,1210 ----
1.1 noro 575: while (i > 0 && isWordchar (CommandLine [i - 1]))
576: i--, nchars++;
577: }
578: ! #endif /* KANJI */
579:
580: return (delete_previous_n_character (nchars));
581: }
582: ***************
583: *** 1222,1230 ****
584: else
585: cp++, nbyte++;
586: }
587: ! #else KANJI
588: nbyte = n;
589: ! #endif KANJI
590:
591: deleteArea = howlong (&CommandLine[CurrentPosition], nbyte);
592: restArea = howlong (&CommandLine[CurrentPosition + nbyte], 0);
1.2 ! noro 593: --- 1243,1251 ----
1.1 noro 594: else
595: cp++, nbyte++;
596: }
597: ! #else /* KANJI */
598: nbyte = n;
599: ! #endif /* KANJI */
600:
601: deleteArea = howlong (&CommandLine[CurrentPosition], nbyte);
602: restArea = howlong (&CommandLine[CurrentPosition + nbyte], 0);
603: ***************
604: *** 1781,1789 ****
605:
606: # ifdef ALLOCA
607: fcp = (char *) alloca (strlen (dp->d_name) + 1);
608: ! # else ALLOCA
609: fcp = (char *) malloc (strlen (dp->d_name) + 1);
610: ! # endif ALLOCA
611: if (fcp == 0) {
612: fputs ("\r\n", stdout);
613: perror ("alloca:");
1.2 ! noro 614: --- 1802,1810 ----
1.1 noro 615:
616: # ifdef ALLOCA
617: fcp = (char *) alloca (strlen (dp->d_name) + 1);
618: ! # else /* ALLOCA */
619: fcp = (char *) malloc (strlen (dp->d_name) + 1);
620: ! # endif /* ALLOCA */
621: if (fcp == 0) {
622: fputs ("\r\n", stdout);
623: perror ("alloca:");
624: ***************
625: *** 1844,1850 ****
626: # ifndef ALLOCA
627: for (i = 0; fileList [i]; i++)
628: free (fileList [i]);
629: ! # endif ALLOCA
630:
631: closedir(dirp);
632: return (0);
1.2 ! noro 633: --- 1865,1871 ----
1.1 noro 634: # ifndef ALLOCA
635: for (i = 0; fileList [i]; i++)
636: free (fileList [i]);
637: ! # endif /* ALLOCA */
638:
639: closedir(dirp);
640: return (0);
641: ***************
642: *** 1972,1980 ****
643: if (prefix (prefixstring, dp->d_name)) {
644: # ifdef ALLOCA
645: fcp = (char *) alloca (strlen (dp->d_name) + 1);
646: ! # else ALLOCA
647: fcp = (char *) malloc (strlen (dp->d_name) + 1);
648: ! # endif ALLOCA
649: if (fcp == 0) {
650: fputs ("\r\n", stdout);
651: perror ("alloca:");
1.2 ! noro 652: --- 1993,2001 ----
1.1 noro 653: if (prefix (prefixstring, dp->d_name)) {
654: # ifdef ALLOCA
655: fcp = (char *) alloca (strlen (dp->d_name) + 1);
656: ! # else /* ALLOCA */
657: fcp = (char *) malloc (strlen (dp->d_name) + 1);
658: ! # endif /* ALLOCA */
659: if (fcp == 0) {
660: fputs ("\r\n", stdout);
661: perror ("alloca:");
662: ***************
663: *** 2018,2024 ****
664: # ifndef ALLOCA
665: for (i = 0; fileList [i]; i++)
666: free (fileList [i]);
667: ! # endif ALLOCA
668: return;
669: }
670:
1.2 ! noro 671: --- 2039,2045 ----
1.1 noro 672: # ifndef ALLOCA
673: for (i = 0; fileList [i]; i++)
674: free (fileList [i]);
675: ! # endif /* ALLOCA */
676: return;
677: }
678:
679: ***************
680: *** 2065,2071 ****
681: fputs ("\n", stdout);
682: }
683: }
684: ! #endif RINFO
685:
686: bind_key (ft, func, s, dfunc)
687: FUNC ft[]; /* Function table */
1.2 ! noro 688: --- 2086,2092 ----
1.1 noro 689: fputs ("\n", stdout);
690: }
691: }
692: ! #endif /* RINFO */
693:
694: bind_key (ft, func, s, dfunc)
695: FUNC ft[]; /* Function table */
1.2 ! noro 696: Only in fep: fep_edit.o
! 697: diff -cr fep.orig/fep_funcs.c fep/fep_funcs.c
! 698: *** fep.orig/fep_funcs.c Wed Sep 18 18:48:28 2002
! 699: --- fep/fep_funcs.c Tue Sep 3 09:41:44 2002
1.1 noro 700: ***************
701: *** 3,9 ****
702: #ifndef lint
703: static char rcsid[]=
704: "$Header: fep_funcs.c,v 4.5 91/05/29 14:31:01 utashiro Exp $ (SRA)";
705: ! #endif lint
706:
707: #include <stdio.h>
708: #include "fep_defs.h"
709: --- 3,9 ----
710: #ifndef lint
711: static char rcsid[]=
712: "$Header: fep_funcs.c,v 4.5 91/05/29 14:31:01 utashiro Exp $ (SRA)";
713: ! #endif /* lint */
714:
715: #include <stdio.h>
716: #include "fep_defs.h"
1.2 ! noro 717: diff -cr fep.orig/fep_funcs.h fep/fep_funcs.h
! 718: *** fep.orig/fep_funcs.h Wed Sep 18 18:48:29 2002
! 719: --- fep/fep_funcs.h Wed Sep 18 18:39:29 2002
1.1 noro 720: ***************
721: *** 3,9 ****
722: #ifndef lint
723: # define FEP_FUNCS \
724: "$Header: fep_funcs.h,v 4.5 91/05/29 14:31:03 utashiro Exp $ (SRA)"
725: ! #endif lint
726:
727: /*
728: * command line edit functions
729: --- 3,9 ----
730: #ifndef lint
731: # define FEP_FUNCS \
732: "$Header: fep_funcs.h,v 4.5 91/05/29 14:31:03 utashiro Exp $ (SRA)"
733: ! #endif /* lint */
734:
735: /*
736: * command line edit functions
737: ***************
738: *** 22,28 ****
739: --- 22,33 ----
740: int delete_previous_word();
741: int delete_previous_Word();
742: int delete_to_kill_buffer();
1.2 ! noro 743: + #if defined(__CYGWIN__) || defined(sun)
1.1 noro 744: + void terminate(int);
745: + #else
746: void terminate __P((int));
747: + #endif
748: + int send_int_sig();
749: int end_of_line();
750: int expand_file_name();
751: int forward_character();
1.2 ! noro 752: Only in fep: fep_funcs.o
! 753: diff -cr fep.orig/fep_glob.h fep/fep_glob.h
! 754: *** fep.orig/fep_glob.h Wed Sep 18 18:48:29 2002
! 755: --- fep/fep_glob.h Tue Sep 3 09:41:44 2002
1.1 noro 756: ***************
757: *** 3,9 ****
758: #ifndef lint
759: # define FEP_GLOB \
760: "$Header: fep_glob.h,v 4.1 88/08/28 14:36:41 utashiro Exp $ (SRA)"
761: ! #endif lint
762:
763: extern FUNC *curFuncTab; /* function table */
764: extern FUNC *altFuncTab; /* altanative function table */
765: --- 3,9 ----
766: #ifndef lint
767: # define FEP_GLOB \
768: "$Header: fep_glob.h,v 4.1 88/08/28 14:36:41 utashiro Exp $ (SRA)"
769: ! #endif /* lint */
770:
771: extern FUNC *curFuncTab; /* function table */
772: extern FUNC *altFuncTab; /* altanative function table */
1.2 ! noro 773: diff -cr fep.orig/fep_hist.c fep/fep_hist.c
! 774: *** fep.orig/fep_hist.c Wed Sep 18 18:48:30 2002
! 775: --- fep/fep_hist.c Tue Sep 3 09:41:44 2002
1.1 noro 776: ***************
777: *** 3,9 ****
778: #ifndef lint
779: static char rcsid[]=
780: "$Header: fep_hist.c,v 4.3 88/11/25 20:45:25 utashiro Exp $ (SRA)";
781: ! #endif lint
782:
783: #include <stdio.h>
784: #include <stdlib.h>
785: --- 3,9 ----
786: #ifndef lint
787: static char rcsid[]=
788: "$Header: fep_hist.c,v 4.3 88/11/25 20:45:25 utashiro Exp $ (SRA)";
789: ! #endif /* lint */
790:
791: #include <stdio.h>
792: #include <stdlib.h>
793: ***************
794: *** 12,17 ****
795: --- 12,22 ----
796: #include "fep_defs.h"
797: #include "fep_glob.h"
798: #include "fep_funcs.h"
799: +
800: + #if defined(__FreeBSD__) || defined(__CYGWIN__)
801: + #define re_comp regcomp
802: + #define re_exec regexec
803: + #endif
804:
805: char **HistoryTable;
806: int TopOfHist;
1.2 ! noro 807: Only in fep: fep_hist.o
! 808: diff -cr fep.orig/fep_main.c fep/fep_main.c
! 809: *** fep.orig/fep_main.c Wed Sep 18 18:48:31 2002
! 810: --- fep/fep_main.c Wed Sep 18 18:45:26 2002
1.1 noro 811: ***************
1.2 ! noro 812: *** 3,18 ****
1.1 noro 813: #ifndef lint
814: static char rcsid[]=
815: "$Id: fep_main.c,v 4.11 1993/06/10 02:51:28 utashiro Exp $ (SRA)";
816: ! #endif lint
817:
818: #include <stdio.h>
819: #include <signal.h>
1.2 ! noro 820: #include <sys/types.h>
! 821: #include <sys/stat.h>
! 822: #include <sys/ioctl.h>
! 823: #ifdef TERMIOS
! 824: #include <termios.h>
! 825: ! #ifdef __linux__
! 826: #ifndef _POSIX_VDISABLE
! 827: #define _POSIX_VDISABLE '\0'
! 828: #endif
! 829: --- 3,22 ----
1.1 noro 830: #ifndef lint
831: static char rcsid[]=
832: "$Id: fep_main.c,v 4.11 1993/06/10 02:51:28 utashiro Exp $ (SRA)";
833: ! #endif /* lint */
834:
835: #include <stdio.h>
836: #include <signal.h>
1.2 ! noro 837: #include <sys/types.h>
! 838: #include <sys/stat.h>
1.1 noro 839: #include <sys/ioctl.h>
1.2 ! noro 840: + #if defined(sun)
! 841: + #include <sys/fcntl.h>
! 842: + #include <sys/ttold.h>
! 843: + #endif
1.1 noro 844: #ifdef TERMIOS
845: #include <termios.h>
846: ! #if defined(__linux__) || defined(__CYGWIN__)
847: #ifndef _POSIX_VDISABLE
848: #define _POSIX_VDISABLE '\0'
849: #endif
850: ***************
851: *** 39,45 ****
852: #ifdef STAT
853: static char fep_statrc[] = FEP_STAT;
854: #endif
855: ! #endif lint
856:
857: char *myself; /* the command name */
858: char *prompt = ""; /* prompt string */
1.2 ! noro 859: --- 43,49 ----
1.1 noro 860: #ifdef STAT
861: static char fep_statrc[] = FEP_STAT;
862: #endif
863: ! #endif /* lint */
864:
865: char *myself; /* the command name */
866: char *prompt = ""; /* prompt string */
867: ***************
1.2 ! noro 868: *** 57,63 ****
! 869: --- 61,71 ----
! 870: int debug = OFF; /* debug switch */
! 871: int auto_tty_fix = ON; /* fix tty mode automaticaly */
! 872: FILE *script_fp = NULL; /* script file pointer */
! 873: + #if defined(sun)
! 874: + void catchsig (int); /* function take care SIGCHILD */
! 875: + #else
! 876: void catchsig __P((int)); /* function take care SIGCHILD */
! 877: + #endif
! 878:
! 879: #ifdef TERMIOS
! 880: #define ttystruct termios
! 881: ***************
! 882: *** 72,78 ****
! 883: --- 80,90 ----
! 884: int columns; /* terminal coulumn size */
! 885: char *term_clear; /* terminal clear code */
! 886:
! 887: + #if defined(sun)
! 888: + void (*sighup)(int), (*sigchld)(int), (*sigtstp)(int);
! 889: + #else
! 890: void (*sighup) __P((int)), (*sigchld) __P((int)), (*sigtstp) __P((int));
! 891: + #endif
! 892: /* function buffer for signal */
! 893:
! 894: #ifdef TIOCSETN
! 895: ***************
1.1 noro 896: *** 84,90 ****
897: #ifdef KANJI
898: struct jtchars jtchars_buf; /* kanji tty characters */
899: int kmode_buf; /* kanji mode */
900: ! #endif KANJI
901:
902: char master_tty[16]; /* master tty name */
903: char slave_tty[16]; /* slave tty name */
1.2 ! noro 904: --- 96,102 ----
1.1 noro 905: #ifdef KANJI
906: struct jtchars jtchars_buf; /* kanji tty characters */
907: int kmode_buf; /* kanji mode */
908: ! #endif /* KANJI */
909:
910: char master_tty[16]; /* master tty name */
911: char slave_tty[16]; /* slave tty name */
912: ***************
1.2 ! noro 913: *** 296,307 ****
! 914: --- 308,324 ----
! 915: fix_signal ()
! 916: {
! 917: #ifdef SIGWINCH
! 918: + #if defined(sun)
! 919: + void sigwinch (int);
! 920: + #else
! 921: void sigwinch __P((int));
! 922: #endif
! 923: + #endif
! 924:
1.1 noro 925: sighup = signal (SIGHUP, terminate);
926: sigchld = signal (SIGCHLD, catchsig);
927: sigtstp = signal (SIGTSTP, SIG_IGN);
928: + signal (SIGINT, (void(*)())send_int_sig);
929: #ifdef SIGWINCH
930: (void) signal(SIGWINCH, sigwinch);
931: #endif
932: ***************
933: *** 685,691 ****
1.2 ! noro 934: --- 702,710 ----
1.1 noro 935: */
936: t = open ("/dev/tty", 2);
937: if (t >= 0) {
938: + #ifndef __CYGWIN32__
939: ioctl (t, TIOCNOTTY, (char *) 0);
940: + #endif
941: (void) close (t);
942: }
943:
944: ***************
945: *** 818,823 ****
1.2 ! noro 946: --- 837,849 ----
1.1 noro 947: exit (0);
948: }
949:
950: + send_int_sig() {
951: + #ifndef __CYGWIN__
952: + kill(child_pid,SIGINT);
953: + #endif
954: + return 0;
955: + }
956: +
957: get_pty_master()
958: {
959: char c;
960: ***************
1.2 ! noro 961: *** 850,856 ****
1.1 noro 962: }
963: }
964: }
965: !
966: /*
967: * Can't get master tty
968: */
1.2 ! noro 969: --- 876,882 ----
1.1 noro 970: }
971: }
972: }
973: ! #endif
974: /*
975: * Can't get master tty
976: */
977: ***************
1.2 ! noro 978: *** 889,895 ****
1.1 noro 979: # if defined(TIOCKGETC) && defined(TIOCKSETC)
980: ioctl (0, TIOCKGETC, (char *) &jtchars_buf);
981: # endif
982: ! #endif KANJI
983:
984: FD_ZERO(&stdinmask);
985: FD_ZERO(&mastermask);
1.2 ! noro 986: --- 915,921 ----
1.1 noro 987: # if defined(TIOCKGETC) && defined(TIOCKSETC)
988: ioctl (0, TIOCKGETC, (char *) &jtchars_buf);
989: # endif
990: ! #endif /* KANJI */
991:
992: FD_ZERO(&stdinmask);
993: FD_ZERO(&mastermask);
994: ***************
1.2 ! noro 995: *** 928,934 ****
1.1 noro 996: # if defined(TIOCKGETC) && defined(TIOCKSETC)
997: ioctl (slave, TIOCKSETC, (char *) &jtchars_buf);
998: # endif
999: ! #endif KANJI
1000:
1001: #ifdef TIOCSWINSZ
1002: {
1.2 ! noro 1003: --- 954,960 ----
1.1 noro 1004: # if defined(TIOCKGETC) && defined(TIOCKSETC)
1005: ioctl (slave, TIOCKSETC, (char *) &jtchars_buf);
1006: # endif
1007: ! #endif /* KANJI */
1008:
1009: #ifdef TIOCSWINSZ
1010: {
1011: ***************
1.2 ! noro 1012: *** 955,962 ****
! 1013: --- 981,994 ----
! 1014: suspend()
1.1 noro 1015: {
1016: long pid;
1.2 ! noro 1017: + #if defined(sun)
! 1018: + void (*func) (int);
! 1019: + #else
1.1 noro 1020: void (*func) __P((int));
1.2 ! noro 1021: + #endif
1.1 noro 1022: + #ifndef __CYGWIN32__
1023: int omask;
1024: + #endif
1025: extern int errno;
1026:
1027: pid = getpid ();
1028: ***************
1.2 ! noro 1029: *** 965,971 ****
! 1030: --- 997,1005 ----
1.1 noro 1031: signal (SIGTSTP, SIG_DFL);
1032: recover_tty();
1033: #define mask(s) (1 << ((s)-1))
1.2 ! noro 1034: + #if !defined(__CYGWIN32__) && !defined(sun)
1.1 noro 1035: omask = sigsetmask (sigblock (0) & ~mask (SIGTSTP));
1036: + #endif
1037: kill (0, SIGTSTP);
1038:
1039: if (kill (child_pid, SIGCONT) < 0 && errno == ESRCH) {
1040: ***************
1.2 ! noro 1041: *** 976,982 ****
! 1042: --- 1010,1018 ----
1.1 noro 1043: kill (0, SIGCONT);
1044: signal (SIGCHLD, func);
1045: signal (SIGTSTP, SIG_IGN);
1.2 ! noro 1046: + #if !defined(__CYGWIN32__) && !defined(sun)
1.1 noro 1047: sigblock (mask (SIGTSTP));
1048: + #endif
1049: fix_tty ();
1050: if (look_var ("auto-repaint"))
1051: fep_repaint(0);
1.2 ! noro 1052: Only in fep.orig: fep_main.c.rej
! 1053: Only in fep: fep_main.o
! 1054: diff -cr fep.orig/fep_set.c fep/fep_set.c
! 1055: *** fep.orig/fep_set.c Wed Sep 18 18:48:31 2002
! 1056: --- fep/fep_set.c Tue Sep 3 09:41:44 2002
1.1 noro 1057: ***************
1058: *** 3,9 ****
1059: #ifndef lint
1060: static char rcsid[]=
1061: "$Header: fep_set.c,v 4.3 91/05/29 14:31:08 utashiro Exp $ (SRA)";
1062: ! #endif lint
1063:
1064: #include <stdio.h>
1065: #include "fep_defs.h"
1066: --- 3,9 ----
1067: #ifndef lint
1068: static char rcsid[]=
1069: "$Header: fep_set.c,v 4.3 91/05/29 14:31:08 utashiro Exp $ (SRA)";
1070: ! #endif /* lint */
1071:
1072: #include <stdio.h>
1073: #include "fep_defs.h"
1074: ***************
1075: *** 67,76 ****
1076: #ifdef HASH
1077: #define HASHNUM 10
1078: VAR *var_htab[HASHNUM];
1079: ! #else HASH
1080: VAR var_top = {"top", "top", (char *)0, (VAR *)0};
1081: VAR *var_list = &var_top;
1082: ! #endif HASH
1083:
1084: /*
1085: * Functions
1086: --- 67,76 ----
1087: #ifdef HASH
1088: #define HASHNUM 10
1089: VAR *var_htab[HASHNUM];
1090: ! #else /* HASH */
1091: VAR var_top = {"top", "top", (char *)0, (VAR *)0};
1092: VAR *var_list = &var_top;
1093: ! #endif /* HASH */
1094:
1095: /*
1096: * Functions
1097: ***************
1098: *** 251,262 ****
1099: for (; vp != (VAR *)0; vp = vp->v_next)
1100: printf ("%-16s %s\n", vp->v_name, vp->v_value);
1101: }
1102: ! #else HASH
1103: register VAR *vp;
1104:
1105: for (vp = var_list->v_next; vp; vp = vp->v_next)
1106: printf ("%-16s %s\n", vp->v_name, vp->v_value);
1107: ! #endif HASH
1108: }
1109:
1110: #ifdef HASH
1111: --- 251,262 ----
1112: for (; vp != (VAR *)0; vp = vp->v_next)
1113: printf ("%-16s %s\n", vp->v_name, vp->v_value);
1114: }
1115: ! #else /* HASH */
1116: register VAR *vp;
1117:
1118: for (vp = var_list->v_next; vp; vp = vp->v_next)
1119: printf ("%-16s %s\n", vp->v_name, vp->v_value);
1120: ! #endif /* HASH */
1121: }
1122:
1123: #ifdef HASH
1124: ***************
1125: *** 273,279 ****
1126:
1127: return (sum % HASHNUM);
1128: }
1129: ! #endif HASH
1130:
1131: /*
1132: * Get pointer to VAR.
1133: --- 273,279 ----
1134:
1135: return (sum % HASHNUM);
1136: }
1137: ! #endif /* HASH */
1138:
1139: /*
1140: * Get pointer to VAR.
1141: ***************
1142: *** 288,294 ****
1143: {
1144: #ifdef HASH
1145: register i = getindex (name);
1146: ! #endif HASH
1147: VAR *vp, *last = (VAR *)0;
1148:
1149: #ifdef HASH
1150: --- 288,294 ----
1151: {
1152: #ifdef HASH
1153: register i = getindex (name);
1154: ! #endif /* HASH */
1155: VAR *vp, *last = (VAR *)0;
1156:
1157: #ifdef HASH
1158: ***************
1159: *** 296,302 ****
1160: if (strcmp (name, vp->v_value) == 0)
1161: return (vp);
1162: }
1163: ! #else HASH
1164: for (vp = var_list->v_next, last = var_list; vp; last = vp, vp = vp->v_next) {
1165: int r;
1166:
1167: --- 296,302 ----
1168: if (strcmp (name, vp->v_value) == 0)
1169: return (vp);
1170: }
1171: ! #else /* HASH */
1172: for (vp = var_list->v_next, last = var_list; vp; last = vp, vp = vp->v_next) {
1173: int r;
1174:
1175: ***************
1176: *** 309,315 ****
1177: else if (r < 0)
1178: break;
1179: }
1180: ! #endif HASH
1181:
1182: if (alloc == 0)
1183: return (0);
1184: --- 309,315 ----
1185: else if (r < 0)
1186: break;
1187: }
1188: ! #endif /* HASH */
1189:
1190: if (alloc == 0)
1191: return (0);
1192: ***************
1193: *** 327,335 ****
1194: else {
1195: var_htab[i] = vp;
1196: }
1197: ! #else HASH
1198: vp->v_next = last->v_next;
1199: last->v_next = vp;
1200: ! #endif HASH
1201: return (vp);
1202: }
1203: --- 327,335 ----
1204: else {
1205: var_htab[i] = vp;
1206: }
1207: ! #else /* HASH */
1208: vp->v_next = last->v_next;
1209: last->v_next = vp;
1210: ! #endif /* HASH */
1211: return (vp);
1212: }
1.2 ! noro 1213: Only in fep: fep_set.o
! 1214: diff -cr fep.orig/fep_stat.h fep/fep_stat.h
! 1215: *** fep.orig/fep_stat.h Wed Sep 18 18:48:31 2002
! 1216: --- fep/fep_stat.h Tue Sep 3 09:41:44 2002
1.1 noro 1217: ***************
1218: *** 3,9 ****
1219: #ifndef lint
1220: # define FEP_STAT \
1221: "$Header: fep_stat.h,v 4.0 88/08/05 20:21:58 utashiro Rel $ (SRA)"
1222: ! #endif lint
1223:
1224: extern long stat_obyte;
1225: extern long stat_ibyte;
1226: --- 3,9 ----
1227: #ifndef lint
1228: # define FEP_STAT \
1229: "$Header: fep_stat.h,v 4.0 88/08/05 20:21:58 utashiro Rel $ (SRA)"
1230: ! #endif /* lint */
1231:
1232: extern long stat_obyte;
1233: extern long stat_ibyte;
1.2 ! noro 1234: diff -cr fep.orig/fep_util.c fep/fep_util.c
! 1235: *** fep.orig/fep_util.c Wed Sep 18 18:48:32 2002
! 1236: --- fep/fep_util.c Wed Sep 18 18:44:49 2002
1.1 noro 1237: ***************
1238: *** 3,16 ****
1239: #ifndef lint
1240: static char rcsid[]=
1241: "$Header: fep_util.c,v 4.1 88/08/28 18:57:41 utashiro Exp $ (SRA)";
1242: ! #endif lint
1243:
1244: #ifndef MKARGDEBUG
1245:
1246: #include <stdio.h>
1247: #include <pwd.h>
1248: #include <sys/types.h>
1249: #include <sys/dir.h>
1250: #include <ctype.h>
1251: #include "fep_defs.h"
1252:
1253: --- 3,20 ----
1254: #ifndef lint
1255: static char rcsid[]=
1256: "$Header: fep_util.c,v 4.1 88/08/28 18:57:41 utashiro Exp $ (SRA)";
1257: ! #endif /* lint */
1258:
1259: #ifndef MKARGDEBUG
1260:
1261: #include <stdio.h>
1262: #include <pwd.h>
1263: #include <sys/types.h>
1.2 ! noro 1264: + #if defined(__CYGWIN__) || defined(sun)
1.1 noro 1265: + #include <dirent.h>
1266: + #else
1267: #include <sys/dir.h>
1268: + #endif
1269: #include <ctype.h>
1270: #include "fep_defs.h"
1271:
1272: ***************
1273: *** 178,186 ****
1274: {
1275: return (d1 > d2 ? d1 : d2);
1276: }
1277: ! #endif max
1278:
1279: ! #else MKARGDEBUG
1280:
1281: #include <stdio.h>
1282: #include <ctype.h>
1283: --- 182,190 ----
1284: {
1285: return (d1 > d2 ? d1 : d2);
1286: }
1287: ! #endif /* max */
1288:
1289: ! #else /* MKARGDEBUG */
1290:
1291: #include <stdio.h>
1292: #include <ctype.h>
1293: ***************
1294: *** 198,204 ****
1295: showArgs (s);
1296: }
1297: }
1298: ! #endif MKARGDEBUG
1299:
1300: showArgs (comline)
1301: char *comline;
1302: --- 202,208 ----
1303: showArgs (s);
1304: }
1305: }
1306: ! #endif /* MKARGDEBUG */
1307:
1308: showArgs (comline)
1309: char *comline;
1310: ***************
1311: *** 402,405 ****
1312: else
1313: return (iskanji (*cp));
1314: }
1315: ! #endif KANJI
1316: --- 406,409 ----
1317: else
1318: return (iskanji (*cp));
1319: }
1320: ! #endif /* KANJI */
1.2 ! noro 1321: Only in fep: fep_util.o
! 1322: diff -cr fep.orig/fep_vi.c fep/fep_vi.c
! 1323: *** fep.orig/fep_vi.c Wed Sep 18 18:48:33 2002
! 1324: --- fep/fep_vi.c Tue Sep 3 09:41:44 2002
1.1 noro 1325: ***************
1326: *** 3,15 ****
1327: #ifndef lint
1328: static char rcsid[]=
1329: "$Header: fep_vi.c,v 4.7 91/05/29 14:31:10 utashiro Exp $ (SRA)";
1330: ! #endif lint
1331:
1332: #include <stdio.h>
1333: #include <sys/ioctl.h>
1334: #ifdef TERMIOS
1335: #include <termios.h>
1336: ! #ifdef __linux__
1337: #ifndef _POSIX_VDISABLE
1338: #define _POSIX_VDISABLE '\0'
1339: #endif
1340: --- 3,15 ----
1341: #ifndef lint
1342: static char rcsid[]=
1343: "$Header: fep_vi.c,v 4.7 91/05/29 14:31:10 utashiro Exp $ (SRA)";
1344: ! #endif /* lint */
1345:
1346: #include <stdio.h>
1347: #include <sys/ioctl.h>
1348: #ifdef TERMIOS
1349: #include <termios.h>
1350: ! #if defined(__linux__) || defined(__CYGWIN__)
1351: #ifndef _POSIX_VDISABLE
1352: #define _POSIX_VDISABLE '\0'
1353: #endif
1354: ***************
1355: *** 176,183 ****
1356: --- 176,190 ----
1357: import (cft, initial_ttymode.c_cc[VSTART], ignore);
1358: import (cft, initial_ttymode.c_cc[VSTOP], ignore);
1359: */
1360: + #if 0
1361: import (cft, initial_ttymode.c_cc[VINTR], insert_and_flush);
1362: import (aft, initial_ttymode.c_cc[VINTR], insert_and_flush);
1363: + #else
1364: + /* added by noro */
1365: + import (cft, initial_ttymode.c_cc[VINTR], send_int_sig);
1366: + /* XXX : this may not be necessary */
1367: + import (aft, initial_ttymode.c_cc[VINTR], send_int_sig);
1368: + #endif
1369: import (cft, initial_ttymode.c_cc[VQUIT], insert_and_flush);
1370: import (cft, initial_ttymode.c_cc[VEOF], send_eof);
1371: #ifdef VSWTC
1372: ***************
1373: *** 198,205 ****
1374: --- 205,217 ----
1375: import (cft, tchars_buf.t_startx, ignore);
1376: import (cft, tchars_buf.t_stopc, ignore);
1377: */
1378: + #if 0
1379: import (cft, tchars_buf.t_intrc, insert_and_flush);
1380: import (aft, tchars_buf.t_intrc, insert_and_flush);
1381: + #else
1382: + import (cft, tchars_buf.t_intrc, send_int_sig);
1383: + import (aft, tchars_buf.t_intrc, send_int_sig);
1384: + #endif
1385: import (cft, tchars_buf.t_quitc, insert_and_flush);
1386: import (cft, tchars_buf.t_eofc, send_eof);
1387: import (cft, tchars_buf.t_brkc, insert_and_flush);
1.2 ! noro 1388: Only in fep: fep_vi.o
! 1389: diff -cr fep.orig/feprc.sample fep/feprc.sample
! 1390: *** fep.orig/feprc.sample Wed Sep 18 18:48:33 2002
! 1391: --- fep/feprc.sample Tue Sep 3 09:41:44 2002
1.1 noro 1392: ***************
1393: *** 6,11 ****
1394: --- 6,13 ----
1395: set alarm-on-eof
1396: set savehist=50
1397:
1398: + #sed editmode=vi
1399: +
1400: echo "Welcome to fep! Editmode is" $editmode
1401: echo "I'm a front end processor for" $command
1402:
1403: ***************
1404: *** 39,41 ****
1405: --- 41,55 ----
1406: else
1407: echo "History will be saved to" $history-file
1408: endif
1409: +
1410: + fep-bind suspend "\^Z"
1411: +
1412: + #Fujimoto's setting
1413: + fep-bind delete-previous-character "\^H"
1414: + fep-bind backward-character "\^[[D"
1415: + fep-bind forward-character "\^[[C"
1416: + # fep-bind beginning-of-line "\^A"
1417: + # fep-bind end-of-line "\^E"
1418: + fep-bind previous-history "\^[[A"
1419: + fep-bind next-history "\^[[B"
1420: +
1.2 ! noro 1421: Only in fep: fepscript
FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>
![[BACK]](/icons/cvsweb/back.gif){kind=icon}
Return to fep+NetBSD-OpenXM.diff CVS log ![[TXT]](/icons/cvsweb/text.gif){kind=icon}
![[DIR]](/icons/cvsweb/dir.gif){kind=icon}
Up to [local] / OpenXM_contrib2 / fep