1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
|
--- a/build/Makefile.in
+++ b/build/Makefile.in
@@ -4,7 +4,7 @@ srcdir= @srcdir@/..
CC= @CC@
OPTFLAG=@OPTFLAG@
CFLAGS= -c $(OPTFLAG) @CFLAGS@ -I. -I$(srcdir)/include @CPPFLAGS@
-LDFLAGS=@LDFLAGS@
+LDFLAGS=-lreadline -lncurses
PERL= @vi_cv_path_perl@
PERLLIB=@vi_cv_perllib@
SHRPENV=@shrpenv@
@@ -139,8 +139,8 @@ install_common:
cd $(datadir)/vi/catalog && $(chmod) $(fmode) *)
@echo "Installing Perl scripts: $(datadir)/vi/perl ..."
$(mkdir) $(datadir)/vi/perl && $(chmod) $(dmode) $(datadir)/vi/perl
- [ -f VI.pm ] && $(cp) VI.pm $(datadir)/vi/perl && \
- cd $(datadir)/vi/perl && $(chmod) $(fmode) VI.pm)
+ #[ -f VI.pm ] && $(cp) VI.pm $(datadir)/vi/perl && \
+ # cd $(datadir)/vi/perl && $(chmod) $(fmode) VI.pm
(cd $(srcdir)/perl_scripts && $(cp) *.pl $(datadir)/vi/perl && \
cd $(datadir)/vi/perl && $(chmod) $(fmode) *.pl)
@echo "Installing Tcl scripts: $(datadir)/vi/tcl ..."
--- a/ex/ex_script.c
+++ b/ex/ex_script.c
@@ -23,9 +23,11 @@ static const char sccsid[] = "@(#)ex_script.c 10.30 (Berkeley) 9/24/96";
#include <sys/select.h>
#endif
#include <sys/stat.h>
+
#ifdef HAVE_SYS5_PTY
-#include <sys/stropts.h>
+ //#include <sys/stropts.h>
#endif
+
#include <sys/time.h>
#include <sys/wait.h>
@@ -718,19 +720,19 @@ ptys_open(fdm, pts_name)
return (-5);
}
- if (ioctl(fds, I_PUSH, "ptem") < 0) {
+ if (ioctl(fds, TIOCPKT, "ptem") < 0) {
close(fds);
close(fdm);
return (-6);
}
- if (ioctl(fds, I_PUSH, "ldterm") < 0) {
+ if (ioctl(fds, TIOCPKT, "ldterm") < 0) {
close(fds);
close(fdm);
return (-7);
}
- if (ioctl(fds, I_PUSH, "ttcompat") < 0) {
+ if (ioctl(fds, TIOCPKT, "ttcompat") < 0) {
close(fds);
close(fdm);
return (-8);
|