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
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
|
--- bpatch.c.orig Wed Jan 17 15:33:33 1990
+++ bpatch.c Mon Mar 18 19:23:16 1996
@@ -90,10 +90,15 @@
/*E*/
/*S includes, globals, and defines */
/*Page Eject*/
-#include <curses.h>
+#include <ncurses.h>
#include <fcntl.h>
#include <signal.h>
#include <ctype.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#include <stdio.h>
+#include <termios.h>
#include <sys/types.h>
#include <sys/stat.h>
@@ -103,14 +108,8 @@
void icc ();
void copyrec ();
void schwapp ();
-
-/* added declarations, mostly for cleanliness */
-extern long lseek();
-extern long atol();
-extern char *strncpy();
-extern void exit();
-extern unsigned sleep(); /* signal problems ??? if sleep called */
-extern void perror();
+void breakp ();
+void reset ();
/* set up for calls to outstr and errmsg, etc, */
/* by use of sprintf to fill outbuf */
@@ -190,7 +189,7 @@
#ifdef MOD_HAX
#else /* use original code... */
/* plus some more for restoring terminal function */
- struct termio asis, aswas;
+ struct termios asis, aswas;
#endif /* MOD_HAX */
/*S main - control all the work from here */
@@ -210,12 +209,10 @@
extern WINDOW *newwin ();
register char *cp; /* general purpose char ptr */
- extern char *gets (); /* get string from stdin */
char m = '\017'; /* mask for hex edit */
char response[512]; /* general purpose buffer */
int z; /* character read in */
- int breakp (); /* signal trapping function */
int c; /* current screen column */
int change = 0; /* true if cmd line option toggled */
int fid; /* file descriptor */
@@ -235,7 +232,6 @@
extern long getnum ();
extern char *instr (); /* get a string from the cmd line */
- extern int reset (); /* exit function - reset terminal */
/* ------------------------------------------------------------ */
/* set up signal handling */
@@ -339,13 +335,13 @@
but it's good enough. -r$ */
raw();
#else /* use original code... */
- ioctl (0, TCGETA, &asis);
+ tcgetattr (0, &asis);
aswas = asis; /* save termio stuff for later restore */
asis.c_cc[VINTR] = '\0';
asis.c_iflag &= ~IXON;
asis.c_iflag &= ~IXOFF;
asis.c_iflag &= ~IXANY;
- ioctl (0, TCSETA, &asis);
+ tcsetattr (0, TCSANOW, &asis);
#endif /* MOD_HAX */
}
@@ -478,7 +474,9 @@
}
pbrk = 0;
fprintf (stderr, "\007");
- gets (response);
+ fgets (response, 512, stdin);
+ if ((cp = strchr (response, '\n')))
+ *cp = 0;
if (pbrk) status = EOF;
}
@@ -832,7 +830,8 @@
touchwin (alphawin);
wrefresh (alphawin);
- while ((z = wgetch (alphawin)) != DEL)
+ while ((z = wgetch (alphawin)) != KEY_DC &&
+ z != KEY_BACKSPACE)
{
if (!arrow (z, &r, &c))
{
@@ -902,7 +901,8 @@
touchwin (hexwin);
wrefresh (hexwin);
- while ((z = wgetch (hexwin)) != DEL)
+ while ((z = wgetch (hexwin)) != KEY_DC
+ && z != KEY_BACKSPACE)
{
if (!arrow (z, &r, &c))
{
@@ -1281,7 +1281,7 @@
/*S breakp - set pbrk on interrupt */
/*H breakp */
/*E*/
-int breakp (i)
+void breakp (i)
int i;
{
int s;
@@ -1592,6 +1592,7 @@
/*S reset - reset terminal to original state */
/*H reset */
/*E*/
+void
reset (sig)
int sig;
{
@@ -1600,7 +1601,7 @@
move (23, 0);
refresh ();
#ifndef MOD_HAX
- ioctl (0, TCSETA, &aswas);
+ tcsetattr (0, TCSANOW, &aswas);
#endif
endwin ();
}
@@ -1610,7 +1611,6 @@
fprintf (stderr, "killed with signal %d\n", sig);
exit (sig);
}
- return (0);
}
/*S arrow - determine if current character is a cursor control key */
/*H arrow */
|
