1 |
< |
/* Copyright (c) 1986 Regents of the University of California */ |
1 |
> |
/* Copyright (c) 1994 Regents of the University of California */ |
2 |
|
|
3 |
|
#ifndef lint |
4 |
|
static char SCCSid[] = "$SunId$ LBL"; |
18 |
|
|
19 |
|
#include <ctype.h> |
20 |
|
|
21 |
+ |
extern char *fgetword(), *strcpy(); |
22 |
+ |
|
23 |
|
OBJREC *objblock[MAXOBJBLK]; /* our objects */ |
24 |
|
OBJECT nobjects = 0; /* # of objects */ |
25 |
|
|
26 |
|
|
27 |
< |
readobj(input) /* read in an object file or stream */ |
28 |
< |
char *input; |
27 |
> |
readobj(inpspec) /* read in an object file or stream */ |
28 |
> |
char *inpspec; |
29 |
|
{ |
30 |
|
FILE *popen(); |
31 |
< |
char *fgets(), *fgetline(); |
31 |
> |
char *fgetline(); |
32 |
> |
OBJECT lastobj; |
33 |
|
FILE *infp; |
34 |
|
char buf[512]; |
35 |
|
register int c; |
36 |
|
|
37 |
< |
if (input == NULL) { |
37 |
> |
lastobj = nobjects; |
38 |
> |
if (inpspec == NULL) { |
39 |
|
infp = stdin; |
40 |
< |
input = "standard input"; |
41 |
< |
} else if (input[0] == '!') { |
42 |
< |
if ((infp = popen(input+1, "r")) == NULL) { |
43 |
< |
sprintf(errmsg, "cannot execute \"%s\"", input); |
40 |
> |
inpspec = "standard input"; |
41 |
> |
} else if (inpspec[0] == '!') { |
42 |
> |
if ((infp = popen(inpspec+1, "r")) == NULL) { |
43 |
> |
sprintf(errmsg, "cannot execute \"%s\"", inpspec); |
44 |
|
error(SYSTEM, errmsg); |
45 |
|
} |
46 |
< |
} else if ((infp = fopen(input, "r")) == NULL) { |
47 |
< |
sprintf(errmsg, "cannot open scene file \"%s\"", input); |
46 |
> |
} else if ((infp = fopen(inpspec, "r")) == NULL) { |
47 |
> |
sprintf(errmsg, "cannot open scene file \"%s\"", inpspec); |
48 |
|
error(SYSTEM, errmsg); |
49 |
|
} |
50 |
|
while ((c = getc(infp)) != EOF) { |
58 |
|
readobj(buf); |
59 |
|
} else { /* object */ |
60 |
|
ungetc(c, infp); |
61 |
< |
getobject(input, infp); |
61 |
> |
getobject(inpspec, infp); |
62 |
|
} |
63 |
|
} |
64 |
< |
if (input[0] == '!') |
64 |
> |
if (inpspec[0] == '!') |
65 |
|
pclose(infp); |
66 |
|
else |
67 |
|
fclose(infp); |
68 |
+ |
if (nobjects == lastobj) { |
69 |
+ |
sprintf(errmsg, "(%s): empty file", inpspec); |
70 |
+ |
error(WARNING, errmsg); |
71 |
+ |
} |
72 |
|
} |
73 |
|
|
74 |
|
|
85 |
|
error(SYSTEM, "out of object space"); |
86 |
|
objp = objptr(obj); |
87 |
|
/* get modifier */ |
88 |
< |
fscanf(fp, "%s", sbuf); |
88 |
> |
strcpy(sbuf, "EOF"); |
89 |
> |
fgetword(sbuf, MAXSTR, fp); |
90 |
|
if (!strcmp(sbuf, VOIDID)) |
91 |
|
objp->omod = OVOID; |
92 |
|
else if ((objp->omod = modifier(sbuf)) == OVOID) { |
94 |
|
error(USER, errmsg); |
95 |
|
} |
96 |
|
/* get type */ |
97 |
< |
fscanf(fp, "%s", sbuf); |
97 |
> |
strcpy(sbuf, "EOF"); |
98 |
> |
fgetword(sbuf, MAXSTR, fp); |
99 |
|
if (!strcmp(sbuf, ALIASID)) |
100 |
|
objp->otype = -1; |
101 |
|
else if ((objp->otype = otype(sbuf)) < 0) { |
103 |
|
error(USER, errmsg); |
104 |
|
} |
105 |
|
/* get identifier */ |
106 |
< |
fscanf(fp, "%s", sbuf); |
106 |
> |
sbuf[0] = '\0'; |
107 |
> |
fgetword(sbuf, MAXSTR, fp); |
108 |
|
objp->oname = savqstr(sbuf); |
109 |
|
/* get arguments */ |
110 |
|
if (objp->otype == -1) { |
111 |
|
register OBJECT alias; |
112 |
< |
fscanf(fp, "%s", sbuf); |
112 |
> |
strcpy(sbuf, "EOF"); |
113 |
> |
fgetword(sbuf, MAXSTR, fp); |
114 |
|
if ((alias = modifier(sbuf)) == OVOID) { |
115 |
|
sprintf(errmsg, |
116 |
|
"(%s): bad reference \"%s\" for %s \"%s\"", |
128 |
|
} |
129 |
|
/* initialize */ |
130 |
|
objp->os = NULL; |
119 |
– |
objp->lastrno = -1; |
131 |
|
|
132 |
|
insertobject(obj); /* add to global structure */ |
133 |
|
} |