| 9 |
|
|
| 10 |
|
#include "copyright.h" |
| 11 |
|
|
| 12 |
< |
#include "standard.h" |
| 12 |
> |
#include <ctype.h> |
| 13 |
> |
#include <string.h> |
| 14 |
> |
#include <stdio.h> |
| 15 |
|
|
| 16 |
+ |
#include "platform.h" |
| 17 |
+ |
#include "paths.h" |
| 18 |
+ |
#include "standard.h" |
| 19 |
|
#include "object.h" |
| 15 |
– |
|
| 20 |
|
#include "otypes.h" |
| 21 |
|
|
| 18 |
– |
#include <ctype.h> |
| 22 |
|
|
| 23 |
|
OBJREC *objblock[MAXOBJBLK]; /* our objects */ |
| 24 |
|
OBJECT nobjects = 0; /* # of objects */ |
| 25 |
|
|
| 26 |
|
|
| 27 |
|
void |
| 28 |
< |
readobj(inpspec) /* read in an object file or stream */ |
| 29 |
< |
char *inpspec; |
| 28 |
> |
readobj( /* read in an object file or stream */ |
| 29 |
> |
char *inpspec |
| 30 |
> |
) |
| 31 |
|
{ |
| 32 |
|
OBJECT lastobj; |
| 33 |
|
FILE *infp; |
| 34 |
< |
char buf[1024]; |
| 35 |
< |
register int c; |
| 34 |
> |
char buf[2048]; |
| 35 |
> |
int c; |
| 36 |
|
|
| 37 |
|
lastobj = nobjects; |
| 38 |
|
if (inpspec == NULL) { |
| 73 |
|
|
| 74 |
|
|
| 75 |
|
void |
| 76 |
< |
getobject(name, fp) /* read the next object */ |
| 77 |
< |
char *name; |
| 78 |
< |
FILE *fp; |
| 76 |
> |
getobject( /* read the next object */ |
| 77 |
> |
char *name, |
| 78 |
> |
FILE *fp |
| 79 |
> |
) |
| 80 |
|
{ |
| 81 |
+ |
#define OALIAS -2 |
| 82 |
|
OBJECT obj; |
| 83 |
|
char sbuf[MAXSTR]; |
| 84 |
|
int rval; |
| 85 |
< |
register OBJREC *objp; |
| 85 |
> |
OBJREC *objp; |
| 86 |
|
|
| 87 |
|
if ((obj = newobject()) == OVOID) |
| 88 |
|
error(SYSTEM, "out of object space"); |
| 90 |
|
/* get modifier */ |
| 91 |
|
strcpy(sbuf, "EOF"); |
| 92 |
|
fgetword(sbuf, MAXSTR, fp); |
| 93 |
+ |
if (strchr(sbuf, '\t')) { |
| 94 |
+ |
sprintf(errmsg, "(%s): illegal tab in modifier \"%s\"", |
| 95 |
+ |
name, sbuf); |
| 96 |
+ |
error(USER, errmsg); |
| 97 |
+ |
} |
| 98 |
|
if (!strcmp(sbuf, VOIDID)) |
| 99 |
|
objp->omod = OVOID; |
| 100 |
+ |
else if (!strcmp(sbuf, ALIASMOD)) |
| 101 |
+ |
objp->omod = OALIAS; |
| 102 |
|
else if ((objp->omod = modifier(sbuf)) == OVOID) { |
| 103 |
|
sprintf(errmsg, "(%s): undefined modifier \"%s\"", name, sbuf); |
| 104 |
|
error(USER, errmsg); |
| 106 |
|
/* get type */ |
| 107 |
|
strcpy(sbuf, "EOF"); |
| 108 |
|
fgetword(sbuf, MAXSTR, fp); |
| 109 |
< |
if (!strcmp(sbuf, ALIASID)) |
| 97 |
< |
objp->otype = -1; |
| 98 |
< |
else if ((objp->otype = otype(sbuf)) < 0) { |
| 109 |
> |
if ((objp->otype = otype(sbuf)) < 0) { |
| 110 |
|
sprintf(errmsg, "(%s): unknown type \"%s\"", name, sbuf); |
| 111 |
|
error(USER, errmsg); |
| 112 |
|
} |
| 113 |
|
/* get identifier */ |
| 114 |
|
sbuf[0] = '\0'; |
| 115 |
|
fgetword(sbuf, MAXSTR, fp); |
| 116 |
+ |
if (strchr(sbuf, '\t')) { |
| 117 |
+ |
sprintf(errmsg, "(%s): illegal tab in identifier \"%s\"", |
| 118 |
+ |
name, sbuf); |
| 119 |
+ |
error(USER, errmsg); |
| 120 |
+ |
} |
| 121 |
|
objp->oname = savqstr(sbuf); |
| 122 |
|
/* get arguments */ |
| 123 |
< |
if (objp->otype == -1) { |
| 124 |
< |
register OBJECT alias; |
| 123 |
> |
if (objp->otype == MOD_ALIAS) { |
| 124 |
> |
OBJECT alias; |
| 125 |
|
strcpy(sbuf, "EOF"); |
| 126 |
|
fgetword(sbuf, MAXSTR, fp); |
| 127 |
|
if ((alias = modifier(sbuf)) == OVOID) { |
| 128 |
< |
sprintf(errmsg, |
| 129 |
< |
"(%s): bad reference \"%s\" for %s \"%s\"", |
| 130 |
< |
name, sbuf, ALIASID, objp->oname); |
| 115 |
< |
error(USER, errmsg); |
| 128 |
> |
sprintf(errmsg, "(%s): bad reference \"%s\"", |
| 129 |
> |
name, sbuf); |
| 130 |
> |
objerror(objp, USER, errmsg); |
| 131 |
|
} |
| 132 |
< |
objp->otype = objptr(alias)->otype; |
| 133 |
< |
copystruct(&objp->oargs, &objptr(alias)->oargs); |
| 132 |
> |
if (objp->omod == OALIAS || |
| 133 |
> |
objp->omod == objptr(alias)->omod) { |
| 134 |
> |
objp->omod = alias; |
| 135 |
> |
} else { |
| 136 |
> |
objp->oargs.sarg = (char **)malloc(sizeof(char *)); |
| 137 |
> |
if (objp->oargs.sarg == NULL) |
| 138 |
> |
error(SYSTEM, "out of memory in getobject"); |
| 139 |
> |
objp->oargs.nsargs = 1; |
| 140 |
> |
objp->oargs.sarg[0] = savestr(sbuf); |
| 141 |
> |
} |
| 142 |
|
} else if ((rval = readfargs(&objp->oargs, fp)) == 0) { |
| 143 |
|
sprintf(errmsg, "(%s): bad arguments", name); |
| 144 |
|
objerror(objp, USER, errmsg); |
| 146 |
|
sprintf(errmsg, "(%s): error reading scene", name); |
| 147 |
|
error(SYSTEM, errmsg); |
| 148 |
|
} |
| 149 |
+ |
if (objp->omod == OALIAS) { |
| 150 |
+ |
sprintf(errmsg, "(%s): inappropriate use of '%s' modifier", |
| 151 |
+ |
name, ALIASMOD); |
| 152 |
+ |
objerror(objp, USER, errmsg); |
| 153 |
+ |
} |
| 154 |
|
/* initialize */ |
| 155 |
|
objp->os = NULL; |
| 156 |
|
|
| 157 |
|
insertobject(obj); /* add to global structure */ |
| 158 |
+ |
#undef OALIAS |
| 159 |
|
} |
| 160 |
|
|
| 161 |
|
|
| 162 |
|
OBJECT |
| 163 |
< |
newobject() /* get a new object */ |
| 163 |
> |
newobject(void) /* get a new object */ |
| 164 |
|
{ |
| 165 |
< |
register int i; |
| 165 |
> |
int i; |
| 166 |
|
|
| 167 |
|
if ((nobjects & (OBJBLKSIZ-1)) == 0) { /* new block */ |
| 168 |
|
errno = 0; |
| 177 |
|
} |
| 178 |
|
|
| 179 |
|
void |
| 180 |
< |
freeobjects(firstobj, nobjs) /* free a range of objects */ |
| 181 |
< |
OBJECT firstobj, nobjs; |
| 180 |
> |
freeobjects( /* free a range of objects */ |
| 181 |
> |
int firstobj, |
| 182 |
> |
int nobjs |
| 183 |
> |
) |
| 184 |
|
{ |
| 185 |
< |
register int obj; |
| 185 |
> |
int obj; |
| 186 |
|
/* check bounds */ |
| 187 |
|
if (firstobj < 0) |
| 188 |
|
return; |
| 192 |
|
return; |
| 193 |
|
/* clear objects */ |
| 194 |
|
for (obj = firstobj+nobjs; obj-- > firstobj; ) { |
| 195 |
< |
register OBJREC *o = objptr(obj); |
| 195 |
> |
OBJREC *o = objptr(obj); |
| 196 |
|
free_os(o); /* free client memory */ |
| 197 |
|
freeqstr(o->oname); |
| 198 |
|
freefargs(&o->oargs); |
| 199 |
< |
bzero(o, sizeof(OBJREC)); |
| 199 |
> |
memset((void *)o, '\0', sizeof(OBJREC)); |
| 200 |
|
} |
| 201 |
|
clearobjndx(); |
| 202 |
|
/* free objects off end */ |
