1 |
– |
/* Copyright (c) 1998 Silicon Graphics, Inc. */ |
2 |
– |
|
1 |
|
#ifndef lint |
2 |
< |
static char SCCSid[] = "$SunId$ SGI"; |
2 |
> |
static const char RCSid[] = "$Id$"; |
3 |
|
#endif |
6 |
– |
|
4 |
|
/* |
5 |
|
* Holodeck display process. |
6 |
|
*/ |
7 |
|
|
8 |
+ |
#include <string.h> |
9 |
+ |
#include <ctype.h> |
10 |
+ |
|
11 |
+ |
#include "rterror.h" |
12 |
|
#include "rholo.h" |
13 |
|
#include "rhdisp.h" |
14 |
|
#include "rhdriver.h" |
15 |
|
#include "selcall.h" |
15 |
– |
#include <ctype.h> |
16 |
|
|
17 |
|
#ifndef VIEWHISTLEN |
18 |
|
#define VIEWHISTLEN 4 /* number of remembered views */ |
19 |
|
#endif |
20 |
|
|
21 |
+ |
#ifndef FSIZDEF |
22 |
+ |
#define FSIZDEF 0.125 /* default focus frame size */ |
23 |
+ |
#endif |
24 |
+ |
|
25 |
+ |
#if defined(freebsd) |
26 |
+ |
#define fbufcnt(f) ((f)->_r) |
27 |
+ |
#elif defined(__GNUC__) |
28 |
+ |
#define fbufcnt(f) ((f)->_IO_read_end - (f)->_IO_read_ptr) |
29 |
+ |
#else |
30 |
+ |
#define fbufcnt(f) ((f)->_cnt) |
31 |
+ |
#endif |
32 |
+ |
|
33 |
|
HOLO *hdlist[HDMAX+1]; /* global holodeck list */ |
34 |
|
|
35 |
+ |
char *hdgfn[HDMAX]; /* holodeck section geometry list */ |
36 |
+ |
char *hdpfn[HDMAX]; /* section portal list */ |
37 |
+ |
|
38 |
|
char cmdlist[DC_NCMDS][8] = DC_INIT; |
39 |
|
|
40 |
|
int imm_mode = 0; /* bundles are being delivered immediately */ |
48 |
|
FILE *sstdin, *sstdout; /* server's standard input and output */ |
49 |
|
|
50 |
|
#ifdef DEBUG |
36 |
– |
#include <sys/types.h> |
51 |
|
extern time_t time(); |
52 |
|
static time_t tmodesw; |
53 |
|
static time_t timm, tadd; |
58 |
|
#define RDY_DEV 02 |
59 |
|
#define RDY_SIN 04 |
60 |
|
|
61 |
+ |
static int disp_wait(void); |
62 |
+ |
static void add_holo(HDGRID *hdg, char *gfn, char *pfn); |
63 |
+ |
static void disp_bundle(PACKHEAD *p); |
64 |
+ |
static void new_view(register VIEW *v); |
65 |
+ |
static void set_focus(char *args); |
66 |
+ |
static int usr_input(void); |
67 |
+ |
static void printview(void); |
68 |
|
|
69 |
< |
main(argc, argv) |
70 |
< |
int argc; |
71 |
< |
char *argv[]; |
69 |
> |
|
70 |
> |
int |
71 |
> |
main( |
72 |
> |
int argc, |
73 |
> |
char *argv[] |
74 |
> |
) |
75 |
|
{ |
52 |
– |
extern int eputs(); |
76 |
|
int rdy, inp, res = 0, pause = 0; |
77 |
|
|
78 |
|
progname = argv[0]; |
107 |
|
inp = dev_input(); |
108 |
|
if (inp & DFL(DC_SETVIEW)) |
109 |
|
new_view(&odev.v); |
110 |
< |
if (inp & DFL(DC_GETVIEW)) |
88 |
< |
printview(); |
89 |
< |
if (inp & DFL(DC_LASTVIEW)) |
110 |
> |
else if (inp & DFL(DC_LASTVIEW)) |
111 |
|
new_view(NULL); |
91 |
– |
if (inp & DFL(DC_RESUME)) { |
92 |
– |
serv_request(DR_NOOP, 0, NULL); |
93 |
– |
pause = 0; |
94 |
– |
} |
95 |
– |
if (inp & DFL(DC_PAUSE)) |
96 |
– |
pause = 1; |
112 |
|
if (inp & DFL(DC_REDRAW)) |
113 |
|
imm_mode = beam_sync(1) > 0; |
114 |
+ |
if (inp & DFL(DC_GETVIEW)) |
115 |
+ |
printview(); |
116 |
+ |
if (inp & DFL(DC_FOCUS)) |
117 |
+ |
set_focus(odev_args); |
118 |
|
if (inp & DFL(DC_KILL)) { |
119 |
|
serv_request(DR_KILL, 0, NULL); |
120 |
|
pause = 0; |
125 |
|
serv_request(DR_RESTART, 0, NULL); |
126 |
|
pause = 0; |
127 |
|
} |
128 |
+ |
if (inp & DFL(DC_RESUME)) { |
129 |
+ |
serv_request(DR_NOOP, 0, NULL); |
130 |
+ |
pause = 0; |
131 |
+ |
} |
132 |
+ |
if (inp & DFL(DC_PAUSE)) |
133 |
+ |
pause = 1; |
134 |
|
if (inp & DFL(DC_QUIT)) |
135 |
|
serv_request(DR_SHUTDOWN, 0, NULL); |
136 |
|
} |
137 |
< |
if (rdy & RDY_SIN) /* user input from sstdin */ |
137 |
> |
if (rdy & RDY_SIN && !imm_mode) /* user input from sstdin */ |
138 |
|
switch (usr_input()) { |
139 |
|
case DC_PAUSE: |
140 |
|
pause = 1; |
160 |
|
#endif |
161 |
|
/* all done */ |
162 |
|
quit(0); |
163 |
+ |
return 0; /* pro forma return */ |
164 |
|
} |
165 |
|
|
166 |
|
|
167 |
< |
int |
168 |
< |
disp_wait() /* wait for more input */ |
167 |
> |
static int |
168 |
> |
disp_wait(void) /* wait for more input */ |
169 |
|
{ |
170 |
|
fd_set readset, errset; |
171 |
|
int flgs; |
172 |
|
int n; |
147 |
– |
register int i; |
173 |
|
/* see if we can avoid select call */ |
174 |
< |
if (imm_mode || stdin->_cnt > 0) |
175 |
< |
return(RDY_SRV); |
176 |
< |
if (sstdin != NULL && sstdin->_cnt > 0) |
177 |
< |
return(RDY_SIN); |
178 |
< |
if (dev_flush()) |
174 |
> |
if (hdlist[0] == NULL) |
175 |
> |
return(RDY_SRV); /* initialize first */ |
176 |
> |
flgs = 0; /* flag what's ready already */ |
177 |
> |
if (imm_mode || fbufcnt(stdin) > 0) |
178 |
> |
flgs |= RDY_SRV; |
179 |
> |
if (sstdin != NULL && fbufcnt(sstdin) > 0) |
180 |
> |
flgs |= RDY_SIN; |
181 |
> |
if (odev.inpready) |
182 |
> |
flgs |= RDY_DEV; |
183 |
> |
if (flgs) /* got something? */ |
184 |
> |
return(flgs); |
185 |
> |
if (dev_flush()) /* else flush output & check keyboard+mouse */ |
186 |
|
return(RDY_DEV); |
187 |
< |
/* make the call */ |
187 |
> |
/* if nothing, we need to call select */ |
188 |
|
FD_ZERO(&readset); FD_ZERO(&errset); |
189 |
|
FD_SET(0, &readset); |
190 |
|
FD_SET(0, &errset); |
203 |
|
return(0); |
204 |
|
error(SYSTEM, "select call failure in disp_wait"); |
205 |
|
} |
174 |
– |
flgs = 0; /* flag what's ready */ |
206 |
|
if (FD_ISSET(0, &readset) || FD_ISSET(0, &errset)) |
207 |
|
flgs |= RDY_SRV; |
208 |
|
if (FD_ISSET(odev.ifd, &readset) || FD_ISSET(odev.ifd, &errset)) |
214 |
|
} |
215 |
|
|
216 |
|
|
217 |
< |
add_holo(hdg) /* register a new holodeck section */ |
218 |
< |
HDGRID *hdg; |
217 |
> |
static void |
218 |
> |
add_holo( /* register a new holodeck section */ |
219 |
> |
HDGRID *hdg, |
220 |
> |
char *gfn, |
221 |
> |
char *pfn |
222 |
> |
) |
223 |
|
{ |
224 |
|
VIEW nv; |
225 |
|
double d; |
232 |
|
hdlist[hd] = (HOLO *)malloc(sizeof(HOLO)); |
233 |
|
if (hdlist[hd] == NULL) |
234 |
|
error(SYSTEM, "out of memory in add_holo"); |
235 |
< |
bcopy((char *)hdg, (char *)hdlist[hd], sizeof(HDGRID)); |
235 |
> |
memcpy((void *)hdlist[hd], (void *)hdg, sizeof(HDGRID)); |
236 |
|
hdcompgrid(hdlist[hd]); |
237 |
+ |
hdgfn[hd] = savestr(gfn); |
238 |
+ |
hdpfn[hd] = pfn && *pfn ? savestr(pfn) : (char *)NULL; |
239 |
|
if (hd) |
240 |
|
return; |
241 |
|
/* set initial viewpoint */ |
242 |
< |
copystruct(&nv, &odev.v); |
242 |
> |
nv = odev.v; |
243 |
|
VSUM(nv.vp, hdlist[0]->orig, hdlist[0]->xv[0], 0.5); |
244 |
|
VSUM(nv.vp, nv.vp, hdlist[0]->xv[1], 0.5); |
245 |
|
VSUM(nv.vp, nv.vp, hdlist[0]->xv[2], 0.5); |
255 |
|
} |
256 |
|
|
257 |
|
|
258 |
< |
disp_bundle(p) /* display a ray bundle */ |
259 |
< |
register PACKHEAD *p; |
258 |
> |
static void |
259 |
> |
disp_bundle( /* display a ray bundle */ |
260 |
> |
register PACKHEAD *p |
261 |
> |
) |
262 |
|
{ |
263 |
|
GCOORD gc[2]; |
264 |
|
FVECT ro, rd, wp; |
265 |
|
double d; |
266 |
|
register int i; |
267 |
|
/* get beam coordinates */ |
268 |
< |
if (p->hd < 0 | p->hd >= HDMAX || hdlist[p->hd] == NULL) |
268 |
> |
if ((p->hd < 0) | (p->hd >= HDMAX) || hdlist[p->hd] == NULL) |
269 |
|
error(INTERNAL, "bad holodeck number in disp_bundle"); |
270 |
|
if (!hdbcoord(gc, hdlist[p->hd], p->bi)) |
271 |
|
error(INTERNAL, "bad beam index in disp_bundle"); |
273 |
|
for (i = p->nr; i--; ) { |
274 |
|
hdray(ro, rd, hdlist[p->hd], gc, packra(p)[i].r); |
275 |
|
d = hddepth(hdlist[p->hd], packra(p)[i].d); |
276 |
< |
VSUM(wp, ro, rd, d); /* might be behind viewpoint */ |
277 |
< |
dev_value(packra(p)[i].v, wp, rd); |
276 |
> |
if (d < .99*FHUGE) { |
277 |
> |
VSUM(wp, ro, rd, d); /* might be behind viewpoint */ |
278 |
> |
dev_value(packra(p)[i].v, rd, wp); |
279 |
> |
} else |
280 |
> |
dev_value(packra(p)[i].v, rd, NULL); |
281 |
|
} |
282 |
|
#ifdef DEBUG |
283 |
|
if (imm_mode) nimmrays += p->nr; |
286 |
|
} |
287 |
|
|
288 |
|
|
289 |
< |
new_view(v) /* change view parameters */ |
290 |
< |
register VIEW *v; |
289 |
> |
static void |
290 |
> |
new_view( /* change view parameters */ |
291 |
> |
register VIEW *v |
292 |
> |
) |
293 |
|
{ |
294 |
|
static VIEW viewhist[VIEWHISTLEN]; |
295 |
|
static unsigned nhist; |
296 |
|
VIEW *dv; |
297 |
|
int i, res[2]; |
298 |
+ |
int16 *slist; |
299 |
|
char *err; |
300 |
|
/* restore previous view? */ |
301 |
|
if (v == NULL) { |
311 |
|
error(COMMAND, err); |
312 |
|
return; |
313 |
|
} |
314 |
+ |
if (!dev_view(v)) /* notify display driver */ |
315 |
+ |
goto again; |
316 |
|
if (v->type == VT_PAR) { |
317 |
|
error(COMMAND, "cannot handle parallel views"); |
318 |
|
return; |
319 |
|
} |
320 |
< |
if (!dev_view(v)) /* notify display driver */ |
321 |
< |
goto again; |
322 |
< |
dev_flush(); /* update screen */ |
276 |
< |
beam_init(0); /* compute new beam set */ |
277 |
< |
for (i = 0; (dv = dev_auxview(i, res)) != NULL; i++) |
278 |
< |
if (!beam_view(dv, res[0], res[1])) { |
320 |
> |
beam_init(odev.firstuse); /* compute new beam set */ |
321 |
> |
for (i = 0; (dv = dev_auxview(i, res)) != NULL; i++) { |
322 |
> |
if ((slist = beam_view(dv, res[0], res[1])) == NULL) { |
323 |
|
if (!nhist) { |
324 |
|
error(COMMAND, "invalid starting view"); |
325 |
|
return; |
326 |
|
} |
327 |
< |
copystruct(v, viewhist + ((nhist-1)%VIEWHISTLEN)); |
328 |
< |
goto again; |
327 |
> |
*v = *(viewhist + ((nhist-1)%VIEWHISTLEN)); |
328 |
> |
goto again; /* poss. overloading dev_section()? */ |
329 |
|
} |
330 |
< |
beam_sync(0); /* update server */ |
330 |
> |
DCHECK(*slist < 0, WARNING, "no visible sections in new_view"); |
331 |
> |
for ( ; *slist >= 0; slist++) |
332 |
> |
dev_section(hdgfn[*slist], hdpfn[*slist]); |
333 |
> |
} |
334 |
> |
dev_section(NULL,NULL); /* end section list */ |
335 |
> |
dev_flush(); /* update display */ |
336 |
> |
/* update server */ |
337 |
> |
imm_mode = beam_sync(odev.firstuse) > 0; |
338 |
|
/* record new view */ |
339 |
|
if (v < viewhist || v >= viewhist+VIEWHISTLEN) { |
340 |
< |
copystruct(viewhist + (nhist%VIEWHISTLEN), v); |
340 |
> |
*(viewhist + (nhist%VIEWHISTLEN)) = *v; |
341 |
|
nhist++; |
342 |
|
} |
343 |
|
} |
344 |
|
|
345 |
|
|
346 |
< |
int |
347 |
< |
usr_input() /* get user input and process it */ |
346 |
> |
static void |
347 |
> |
set_focus( /* set focus frame */ |
348 |
> |
char *args |
349 |
> |
) |
350 |
|
{ |
351 |
+ |
double hcent, vcent, hsiz, vsiz; |
352 |
+ |
VIEW *dv, vwfocus; |
353 |
+ |
int i, res[2]; |
354 |
+ |
|
355 |
+ |
i = sscanf(args, "%lf %lf %lf %lf", &hcent, &vcent, &hsiz, &vsiz); |
356 |
+ |
if (i < 2 || hcent < 0 || hcent > 1 || vcent < 0 || vcent > 1) { |
357 |
+ |
beam_init(0); /* restore view */ |
358 |
+ |
for (i = 0; (dv = dev_auxview(i, res)) != NULL; i++) |
359 |
+ |
beam_view(dv, res[0], res[1]); |
360 |
+ |
beam_sync(0); /* update server */ |
361 |
+ |
return; |
362 |
+ |
} |
363 |
+ |
if (i < 4 || hsiz <= hcent || hsiz > 1 || vsiz <= vcent || vsiz > 1) |
364 |
+ |
hsiz = vsiz = FSIZDEF; /* gave center only */ |
365 |
+ |
else { |
366 |
+ |
hsiz -= hcent; hcent += 0.5*hsiz; /* gave min and max */ |
367 |
+ |
vsiz -= vcent; vcent += 0.5*vsiz; |
368 |
+ |
} |
369 |
+ |
beam_init(0); /* add basic views */ |
370 |
+ |
for (i = 0; (dv = dev_auxview(i, res)) != NULL; i++) |
371 |
+ |
beam_view(dv, res[0]>>4, res[1]>>4); |
372 |
+ |
vwfocus = odev.v; /* add focus view */ |
373 |
+ |
switch (odev.v.type) { |
374 |
+ |
case VT_PER: |
375 |
+ |
vwfocus.horiz = 2.*180./PI*atan( |
376 |
+ |
hsiz * tan(PI/180./2.*odev.v.horiz) ); |
377 |
+ |
vwfocus.vert = 2.*180./PI*atan( |
378 |
+ |
vsiz * tan(PI/180./2.*odev.v.vert) ); |
379 |
+ |
break; |
380 |
+ |
case VT_PAR: |
381 |
+ |
case VT_ANG: |
382 |
+ |
vwfocus.horiz = hsiz * odev.v.horiz; |
383 |
+ |
vwfocus.vert = vsiz * odev.v.vert; |
384 |
+ |
break; |
385 |
+ |
case VT_HEM: |
386 |
+ |
vwfocus.horiz = 2.*180./PI*asin( |
387 |
+ |
hsiz * sin(PI/180./2.*odev.v.horiz) ); |
388 |
+ |
vwfocus.vert = 2.*180./PI*asin( |
389 |
+ |
vsiz * sin(PI/180./2.*odev.v.vert) ); |
390 |
+ |
break; |
391 |
+ |
case VT_CYL: |
392 |
+ |
vwfocus.horiz = hsiz * odev.v.horiz; |
393 |
+ |
vwfocus.vert = 2.*180./PI*atan( |
394 |
+ |
vsiz * tan(PI/180./2.*odev.v.vert) ); |
395 |
+ |
break; |
396 |
+ |
default: |
397 |
+ |
error(INTERNAL, "bad view type in set_focus"); |
398 |
+ |
} |
399 |
+ |
vwfocus.hoff = (odev.v.hoff + hcent - 0.5)/hsiz; |
400 |
+ |
vwfocus.voff = (odev.v.voff + vcent - 0.5)/vsiz; |
401 |
+ |
setview(&vwfocus); |
402 |
+ |
beam_view(&vwfocus, (int)(3*odev.hres*hsiz)+100, |
403 |
+ |
(int)(3*odev.vres*vsiz)+100); |
404 |
+ |
beam_sync(0); /* update server */ |
405 |
+ |
} |
406 |
+ |
|
407 |
+ |
|
408 |
+ |
static int |
409 |
+ |
usr_input(void) /* get user input and process it */ |
410 |
+ |
{ |
411 |
|
VIEW vparams; |
412 |
|
char cmd[256]; |
413 |
|
register char *args; |
418 |
|
sstdin = NULL; |
419 |
|
return(-1); |
420 |
|
} |
421 |
< |
if (!*cmd) |
421 |
> |
if (*cmd == '\n') |
422 |
|
return(DC_RESUME); |
423 |
|
for (args = cmd; *args && !isspace(*args); args++) |
424 |
|
; |
435 |
|
} |
436 |
|
switch (i) { |
437 |
|
case DC_SETVIEW: /* set the view */ |
438 |
< |
copystruct(&vparams, &odev.v); |
438 |
> |
vparams = odev.v; |
439 |
|
if (!sscanview(&vparams, args)) |
440 |
|
error(COMMAND, "missing view options"); |
441 |
|
else |
447 |
|
case DC_LASTVIEW: /* restore previous view */ |
448 |
|
new_view(NULL); |
449 |
|
break; |
450 |
+ |
case DC_FOCUS: /* set focus frame */ |
451 |
+ |
set_focus(args); |
452 |
+ |
break; |
453 |
|
case DC_PAUSE: /* pause the current calculation */ |
454 |
|
case DC_RESUME: /* resume the calculation */ |
455 |
|
/* handled in main() */ |
477 |
|
} |
478 |
|
|
479 |
|
|
480 |
< |
printview() /* print our current view to server stdout */ |
480 |
> |
static void |
481 |
> |
printview(void) /* print our current view to server stdout */ |
482 |
|
{ |
483 |
|
fputs(VIEWSTR, sstdout); |
484 |
|
fprintview(&odev.v, sstdout); |
487 |
|
} |
488 |
|
|
489 |
|
|
490 |
< |
int |
491 |
< |
serv_result() /* get next server result and process it */ |
490 |
> |
extern int |
491 |
> |
serv_result(void) /* get next server result and process it */ |
492 |
|
{ |
493 |
|
static char *buf = NULL; |
494 |
|
static int bufsiz = 0; |
495 |
|
MSGHEAD msg; |
379 |
– |
int n; |
496 |
|
/* read message header */ |
497 |
|
if (fread((char *)&msg, sizeof(MSGHEAD), 1, stdin) != 1) |
498 |
|
goto readerr; |
501 |
|
if (buf == NULL) |
502 |
|
buf = (char *)malloc(bufsiz=msg.nbytes); |
503 |
|
else |
504 |
< |
buf = (char *)realloc(buf, bufsiz=msg.nbytes); |
504 |
> |
buf = (char *)realloc((void *)buf, |
505 |
> |
bufsiz=msg.nbytes); |
506 |
|
if (buf == NULL) |
507 |
|
error(SYSTEM, "out of memory in serv_result"); |
508 |
|
} |
517 |
|
disp_bundle((PACKHEAD *)buf); |
518 |
|
break; |
519 |
|
case DS_ADDHOLO: |
520 |
< |
if (msg.nbytes != sizeof(HDGRID)) |
520 |
> |
if (msg.nbytes < sizeof(HDGRID)+2) |
521 |
|
error(INTERNAL, "bad holodeck record from server"); |
522 |
< |
add_holo((HDGRID *)buf); |
522 |
> |
add_holo((HDGRID *)buf, buf+sizeof(HDGRID), |
523 |
> |
buf+sizeof(HDGRID)+strlen(buf+sizeof(HDGRID))+1); |
524 |
|
break; |
525 |
|
case DS_OUTSECT: |
526 |
|
do_outside = 1; |
531 |
|
break; |
532 |
|
case DS_STARTIMM: |
533 |
|
case DS_ENDIMM: |
534 |
+ |
if (!(imm_mode = msg.type==DS_STARTIMM)) |
535 |
+ |
dev_flush(); |
536 |
|
#ifdef DEBUG |
537 |
< |
if (imm_mode != (msg.type==DS_STARTIMM)) { |
537 |
> |
{ |
538 |
|
time_t tnow = time(NULL); |
539 |
< |
if (imm_mode) timm += tnow - tmodesw; |
540 |
< |
else tadd += tnow - tmodesw; |
539 |
> |
if (msg.type==DS_STARTIMM) tadd += tnow - tmodesw; |
540 |
> |
else timm += tnow - tmodesw; |
541 |
|
tmodesw = tnow; |
542 |
|
} |
543 |
|
#endif |
424 |
– |
imm_mode = msg.type==DS_STARTIMM; |
544 |
|
goto noargs; |
545 |
|
case DS_ACKNOW: |
546 |
|
case DS_SHUTDOWN: |
560 |
|
if (feof(stdin)) |
561 |
|
error(SYSTEM, "server process died"); |
562 |
|
error(SYSTEM, "error reading from server process"); |
563 |
+ |
return -1; |
564 |
|
} |
565 |
|
|
566 |
|
|
567 |
< |
serv_request(type, nbytes, p) /* send a request to the server process */ |
568 |
< |
int type, nbytes; |
569 |
< |
char *p; |
567 |
> |
extern void |
568 |
> |
serv_request( /* send a request to the server process */ |
569 |
> |
int type, |
570 |
> |
int nbytes, |
571 |
> |
char *p |
572 |
> |
) |
573 |
|
{ |
574 |
|
MSGHEAD msg; |
575 |
|
int m; |
576 |
+ |
/* consistency checks */ |
577 |
+ |
DCHECK(nbytes < 0 || nbytes > 0 & p == NULL, |
578 |
+ |
CONSISTENCY, "bad buffer handed to serv_request"); |
579 |
|
/* get server's attention for big request */ |
580 |
|
if (nbytes >= BIGREQSIZ-sizeof(MSGHEAD)) { |
581 |
|
serv_request(DR_ATTEN, 0, NULL); |
593 |
|
} |
594 |
|
|
595 |
|
|
596 |
< |
eputs(s) /* put error message to stderr */ |
597 |
< |
register char *s; |
596 |
> |
void |
597 |
> |
eputs( /* put error message to stderr */ |
598 |
> |
register char *s |
599 |
> |
) |
600 |
|
{ |
601 |
|
static int midline = 0; |
602 |
|
|
614 |
|
} |
615 |
|
|
616 |
|
|
617 |
< |
quit(code) /* clean up and exit */ |
618 |
< |
int code; |
617 |
> |
void |
618 |
> |
quit( /* clean up and exit */ |
619 |
> |
int code |
620 |
> |
) |
621 |
|
{ |
622 |
+ |
if (code) |
623 |
+ |
exit(code); |
624 |
|
if (odev.v.type) |
625 |
|
dev_close(); |
626 |
< |
exit(code); |
626 |
> |
exit(0); |
627 |
|
} |