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
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
|
diff -cr ../complt.c ./complt.c
*** ../complt.c Mon Jun 14 09:31:36 1993
--- ./complt.c Wed Apr 17 04:12:07 1996
***************
*** 10,19 ****
--- 10,26 ----
#include "complt.h"
#define LIST_COL 35
+ #ifndef __FreeBSD__
BUFFER *bp = NULL;
BUFFER *prev_bp = NULL;
WINDOW *prev_wp = NULL;
WINDOW prev_window;
+ #else
+ static BUFFER *bp = NULL;
+ static BUFFER *prev_bp = NULL;
+ static WINDOW *prev_wp = NULL;
+ static WINDOW prev_window;
+ #endif /* __FreeBSD__ */
/*
* do some completion.
***************
*** 24,32 ****
--- 31,45 ----
int flags;
{
int res;
+ #ifndef __FreeBSD__
int complete_funcname ();
int complete_buffername ();
int complete_filename ();
+ #else
+ static int complete_funcname ();
+ static int complete_buffername ();
+ static int complete_filename ();
+ #endif /* __FreeBSD__ */
switch (flags & (EFFUNC | EFBUF | EFFILE))
{
***************
*** 256,264 ****
--- 269,283 ----
int cur_row;
int cur_col;
WINDOW *wp;
+ #ifndef __FreeBSD__
int complete_list_funcnames ();
int complete_list_buffernames ();
int complete_list_filenames ();
+ #else
+ static int complete_list_funcnames ();
+ static int complete_list_buffernames ();
+ static int complete_list_filenames ();
+ #endif /* __FreeBSD__ */
if ((bp = bfind ("*Completions*", TRUE)) == NULL)
return (FALSE);
diff -cr ../echo.c ./echo.c
*** ../echo.c Mon Jun 14 09:31:38 1993
--- ./echo.c Wed Apr 17 04:14:53 1996
***************
*** 192,199 ****
{
int cpos;
int c;
! int veread_del_char ();
! int veread_complete ();
#ifdef ADDFUNC /* 91.01.16 by S.Yoshida */
/* If an extra argument exists, use it. */
--- 192,204 ----
{
int cpos;
int c;
! #ifndef __FreeBSD__
! int veread_del_char ();
! int veread_complete ();
! #else
! static int veread_del_char(char *, int);
! static int veread_complete(char *, int, int, int);
! #endif /* __FreeBSD__ */
#ifdef ADDFUNC /* 91.01.16 by S.Yoshida */
/* If an extra argument exists, use it. */
diff -cr ../extend.c ./extend.c
*** ../extend.c Mon Jun 14 09:31:39 1993
--- ./extend.c Wed Apr 17 04:07:48 1996
***************
*** 96,102 ****
--- 96,106 ----
KEYMAP *mp;
PF *pfp;
MAP_ELEMENT *mep;
+ #ifndef __FreeBSD__
KEYMAP *realocmap(); /* 90.03.23 delete "static" by A.Shirahashi */
+ #else
+ static KEYMAP *realocmap(KEYMAP *);
+ #endif /* __FreeBSD__ */
if(ele >= &curmap->map_element[curmap->map_num] || c < ele->k_base) {
if(ele > &curmap->map_element[0] && (funct!=prefix ||
***************
*** 247,253 ****
--- 251,261 ----
{
register KEYMAP *mp;
register int i;
+ #ifndef __FreeBSD__
VOID fixmap(); /* 90.03.23 delete "static" by A.Shirahashi */
+ #else
+ static VOID fixmap(KEYMAP *,KEYMAP *,KEYMAP *);
+ #endif /* __FreeBSD__ */
extern int nmaps;
if((mp = (KEYMAP *)malloc((unsigned)(sizeof(KEYMAP)+
***************
*** 607,614 ****
--- 615,627 ----
#endif
PF name_function();
LINE *lalloc();
+ #ifndef __FreeBSD__
char *skipwhite(), *parsetoken(); /* 90.03.23 delete "static" */
/* by A.Shirahashi */
+ #else
+ static char *skipwhite(char *);
+ static char *parsetoken(char *);
+ #endif /* __FreeBSD__ */
if(macrodef || inmacro) {
ewprintf("Not now!");
diff -cr ../sys/bsd/fileio.c ./sys/bsd/fileio.c
*** ../sys/bsd/fileio.c Wed Feb 13 13:05:02 1991
--- ./sys/bsd/fileio.c Wed Apr 17 04:26:24 1996
***************
*** 6,11 ****
--- 6,15 ----
#include "config.h" /* 90.12.20 by S.Yoshida */
#include "def.h"
+ #ifdef __FreeBSD__
+ #include <string.h>
+ #endif /* __FreeBSD__ */
+
static FILE *ffp;
extern char *getenv(), *strncpy();
char *adjustname();
***************
*** 384,390 ****
--- 388,398 ----
{
int pid;
char *eargv[3];
+ #ifndef __FreeBSD__
union wait status;
+ #else
+ int status;
+ #endif /* __FreeBSD__ */
#ifdef BUGFIX /* 91.01.11 by Y.Kaneko */
if((pid = vfork()) == 0) {
***************
*** 403,409 ****
--- 411,421 ----
if(pid == -1) return -1;
#endif /* BUGFIX */
while(wait(&status) != pid) {}
+ #ifndef __FreeBSD__
return status.w_status == 0;
+ #else
+ return status == 0;
+ #endif /* __FreeBSD__ */
}
BUFFER *dired_(dirname)
***************
*** 461,472 ****
--- 473,506 ----
register char *fn;
{
register char *cp;
+ #ifndef __FreeBSD__
if(llength(lp) <= 47) return ABORT;
(VOID) strcpy(fn, curbp->b_fname);
cp = fn + strlen(fn);
bcopy(&lp->l_text[47], cp, llength(lp) - 47);
cp[llength(lp) - 47] = '\0';
+ #else
+ register int sepidx, duplen;
+
+ if(llength(lp) < 47) return ABORT;
+ cp = strrchr(lp->l_text, ' ');
+ sepidx = (cp - lp->l_text) + 1;
+
+ if ( lgetc(lp, 2) == 'l' && strncmp(cp - 3, " -> " ,4) == 0 ) {
+ duplen = sepidx-4;
+ strncpy(fn, lp->l_text, duplen);
+ fn[duplen] = '\0';
+ sepidx = (strrchr(fn, ' ') - fn) + 1;
+ duplen = duplen - sepidx;
+ }
+ else duplen = llength(lp) - sepidx;
+
+ (VOID) strcpy(fn, curbp->b_fname);
+ cp = fn + strlen(fn);
+ bcopy(&lp->l_text[sepidx], cp, duplen);
+ cp[duplen] = '\0';
+ #endif
return lgetc(lp, 2) == 'd';
}
#endif
diff -cr ../sys/bsd/spawn.c ./sys/bsd/spawn.c
*** ../sys/bsd/spawn.c Wed Feb 13 13:01:41 1991
--- ./sys/bsd/spawn.c Mon Apr 15 21:59:50 1996
***************
*** 39,51 ****
--- 39,65 ----
*/
/*ARGSUSED*/
spawncli(f, n) {
+ #ifndef __FreeBSD__
register int pid, wpid, (*oqsig)(), (*oisig)(), omask;
+ #else
+ register int omask;
+ register pid_t pid, wpid;
+ register sig_t oqsig, oisig;
+ #endif /* __FreeBSD__ */
#ifdef ADDFUNC /* 90.02.14 by S.Yoshida */
#ifdef SIGWINCH /* 90.02.14 by S.Yoshida */
+ #ifndef __FreeBSD__
register int (*owsig)();
+ #else
+ register sig_t owsig;
+ #endif /* __FreeBSD__ */
#endif /* SIGWINCH */
#endif /* ADDFUNC */
+ #ifndef __FreeBSD__
union wait status;
+ #else
+ int status;
+ #endif /* __FreeBSD__ */
if (shellp == NULL) {
shellp = getenv("SHELL");
***************
*** 141,148 ****
--- 155,169 ----
char *tmp;
int ostdin, ostdout, ostderr, in, out, s;
extern char *mktemp();
+ #ifdef __FreeBSD__
+ static char tmpfile[] = "/tmp/ngXXXXXX";
+ #endif /* __FreeBSD__ */
+ #ifndef __FreeBSD__
if ((tmp = mktemp("/tmp/ngXXXXXX")) == NULL)
+ #else
+ if ((tmp = mktemp(tmpfile)) == NULL)
+ #endif /* __FreeBSD__ */
return NULL;
if ((in = open(input ? input : "/dev/null", 0)) < 0)
return NULL;
diff -cr ../sys/bsd/ttyio.c ./sys/bsd/ttyio.c
*** ../sys/bsd/ttyio.c Wed Feb 13 13:02:01 1991
--- ./sys/bsd/ttyio.c Mon Apr 15 21:59:50 1996
***************
*** 32,38 ****
--- 32,42 ----
int ncol; /* Terminal size, columns. */
#ifdef ADDFUNC /* 90.02.14 by S.Yoshida */
#ifdef SIGWINCH /* 90.02.13 by S.Yoshida */
+ #ifndef __FreeBSD__
int ttwinch();
+ #else
+ void ttwinch();
+ #endif /* __FreeBSD__ */
#endif /* SIGWINCH */
#endif /* ADDFUNC */
***************
*** 46,52 ****
--- 50,58 ----
ttopen() {
register char *tv_stype;
char *getenv(), *tgetstr(), tcbuf[1024], err_str[72];
+ #ifndef __FreeBSD__
char *sprintf();
+ #endif /* __FreeBSD__ */
/* do this the REAL way */
if ((tv_stype = getenv("TERM")) == NULL)
***************
*** 256,262 ****
--- 262,272 ----
/*
* Signal handler when window size has changed.
*/
+ #ifndef __FreeBSD__
ttwinch()
+ #else
+ void ttwinch()
+ #endif /* __FreeBSD__ */
{
refresh(FFRAND, 0); /* Very easy way... */
}
|
