106 |
|
sprintf(newp, "%s.%s", |
107 |
|
idprefix, argv[a]); |
108 |
|
if (mal_prefix++) |
109 |
< |
free((void *)idprefix); |
109 |
> |
free(idprefix); |
110 |
|
idprefix = newp; |
111 |
|
} |
112 |
|
continue; |
167 |
|
} |
168 |
|
|
169 |
|
if (mal_prefix) |
170 |
< |
free((void *)idprefix); |
170 |
> |
free(idprefix); |
171 |
|
return(0); |
172 |
|
} |
173 |
|
|
258 |
|
for (i = fi+2; i < ac; i++) |
259 |
|
avp[newac++] = av[i]; |
260 |
|
avp[newac] = NULL; |
261 |
+ |
newid = newidbuf; |
262 |
|
oldid = NULL; |
263 |
|
for (i = 2; i < newac; i++) |
264 |
|
if (!strcmp(avp[i-1], "-n")) { |
265 |
|
oldid = avp[i]; |
265 |
– |
newid = newidbuf; |
266 |
|
if (strlen(oldid)+32 > sizeof(newidbuf)) { |
267 |
|
newid = (char *)malloc(strlen(oldid)+32); |
268 |
|
if (newid == NULL) |
274 |
|
if (oldid == NULL) { |
275 |
|
newav[0] = av[0]; |
276 |
|
newav[1] = "-n"; |
277 |
< |
newav[2] = newid = newidbuf; |
277 |
> |
newav[2] = newid; |
278 |
|
avp = newav; |
279 |
|
newac += 2; |
280 |
|
} |
283 |
|
else |
284 |
|
sprintf(newid, "%s.%d", oldid, k); |
285 |
|
err |= main(newac, avp); |
286 |
< |
if (newid != NULL && newid != newidbuf) |
287 |
< |
free((void *)newid); |
286 |
> |
if (newid != newidbuf) |
287 |
> |
free(newid); |
288 |
|
k++; |
289 |
|
} |
290 |
|
fclose(argfp); |
929 |
|
tinvers[OBJ_CYLINDER] = OBJ_TUBE; |
930 |
|
tinvers[OBJ_TUBE] = OBJ_CYLINDER; |
931 |
|
tinvers[OBJ_INSTANCE] = OBJ_INSTANCE; /* oh, well */ |
932 |
+ |
tinvers[OBJ_MESH] = OBJ_MESH; /* ditto */ |
933 |
|
} |
934 |
|
|
935 |
|
|