51 |
|
} else if (c == '!') { /* command */ |
52 |
|
ungetc(c, infp); |
53 |
|
fgetline(buf, sizeof(buf), infp); |
54 |
< |
readobj(buf); |
54 |
> |
readobj(buf, callback); |
55 |
|
} else { /* object */ |
56 |
|
ungetc(c, infp); |
57 |
|
getobject(input, infp, callback); |
72 |
|
char sbuf[MAXSTR]; |
73 |
|
OBJREC thisobj; |
74 |
|
/* get modifier */ |
75 |
< |
fscanf(fp, "%s", sbuf); |
76 |
< |
thisobj.omod = modifier(sbuf); |
75 |
> |
fscanf(fp, "%*s"); |
76 |
> |
thisobj.omod = OVOID; |
77 |
|
/* get type */ |
78 |
|
fscanf(fp, "%s", sbuf); |
79 |
|
if (!strcmp(sbuf, ALIASID)) |
123 |
|
register FUNARGS *fa; |
124 |
|
FILE *fp; |
125 |
|
{ |
126 |
+ |
extern char *strcpy(); |
127 |
|
char sbuf[MAXSTR]; |
128 |
|
int n; |
129 |
|
register int i; |
137 |
|
for (i = 0; i < fa->nsargs; i++) { |
138 |
|
if (fscanf(fp, "%s", sbuf) != 1) |
139 |
|
return(-1); |
140 |
< |
fa->sarg[i] = savestr(sbuf); |
140 |
> |
fa->sarg[i] = malloc(strlen(sbuf)+1); |
141 |
> |
if (fa->sarg[i] == NULL) |
142 |
> |
goto memerr; |
143 |
> |
(void)strcpy(fa->sarg[i], sbuf); |
144 |
|
} |
145 |
|
} else |
146 |
|
fa->sarg = NULL; |