[ViewVC] Diff of: radiance/ray/src/gen/xform.c

Comparing ray/src/gen/xform.c (file contents):
Revision 2.13 by greg, Tue Jun 18 21:12:51 1996 UTC vs.
Revision 2.42 by greg, Sun Jul 26 18:36:17 2009 UTC

#	Line 1 \| Line 1
1	–	/* Copyright (c) 1996 Regents of the University of California */
2	–
1		#ifndef lint
2	<	static char SCCSid[] = "$SunId$ LBL";
2	>	static const char RCSid[] = "$Id$";
3		#endif
6	–
4		/*
5		* xform.c - program to transform object files.
6		* Transformations must preserve aspect ratio.
#	Line 12 \| Line 9 \| static char SCCSid[] = "$SunId$ LBL";
9		* 11/6/86 Finally added error checking!
10		*/
11
15	–	#include "standard.h"
16	–
17	–	#include "paths.h"
18	–
12		#include <ctype.h>
13
14	+	#include "platform.h"
15	+	#include "paths.h"
16	+	#include "rtprocess.h" /* win_popen() */
17	+	#include "rtio.h"
18	+	#include "rtmath.h"
19		#include "object.h"
22	–
20		#include "otypes.h"
21
22		int xac; /* global xform argument count */
#	Line 29 \| Line 26 \| *int xfa; / start of xf arguments /*
26		XF tot; /* total transformation */
27		int reverse; /* boolean true if scene mirrored */
28
29	<	int invert = 0; /* boolean true to invert surfaces */
29	>	int invert; /* boolean true to invert surfaces */
30
31	<	int expand = 1; /* boolean true to expand commands */
31	>	int expand; /* boolean true to expand commands */
32
33	<	char newmod = NULL; / new modifier for surfaces */
33	>	char newmod; / new modifier for surfaces */
34
35	<	char idprefix = NULL; / prefix for object identifiers */
35	>	char idprefix; / prefix for object identifiers */
36
37	<	#define ALIAS NUMOTYPE /* put alias at end of array */
37	>	FUN ofun[NUMOTYPE] = INIT_OTYPE; /* default types and actions */
38
42	–	#define NUMTYPES (NUMOTYPE+1) /* total number of object types */
43	–
44	–	FUN ofun[NUMTYPES] = INIT_OTYPE; /* default types and actions */
45	–
39		short tinvers[NUMOTYPE]; /* inverse types for surfaces */
40
41		int nrept = 1; /* number of array repetitions */
42
43	<	extern char malloc(), fgetword();
43	>	int stdinused = 0; /* stdin has been used by -f option? */
44
45	<	char mainfn[MAXPATH]; / main file name */
45	>	char mainfn[PATH_MAX]; /* main file name */
46		FILE mainfp = NULL; / main file pointer */
47
48		#define progname (xav[0])
49
50	+	static int doargf(int ac, char **av, int fi);
51	+	static int doarray(int ac, char **av, int ai);
52	+	static void xform(char name, FILE fin);
53	+	static void xfcomm(char fname, FILE fin);
54	+	static void xfobject(char fname, FILE fin);
55	+	static int addxform(FILE *fin);
56	+	static int alias(FILE *fin);
57	+	void initotypes(void); /* XXX conflict with otypes.h */
58	+	static void openmain(char *iname);
59
60	<	main(argc, argv) /* get transform options and transform file */
61	<	int argc;
62	<	char *argv[];
60	>
61	>	int
62	>	main( /* get transform options and transform file */
63	>	int argc,
64	>	char *argv[]
65	>	)
66		{
67	<	char *fname;
67	>	int mal_prefix = 0;
68		int a;
69	<	/* check for array */
69	>	/* check for argument list file */
70		for (a = 1; a < argc; a++)
71	+	if (!strcmp(argv[a], "-f"))
72	+	return(doargf(argc, argv, a));
73	+	/* check for regular array */
74	+	for (a = 1; a < argc; a++)
75		if (!strcmp(argv[a], "-a"))
76		return(doarray(argc, argv, a));
77
78	<	initotypes();
78	>	initotypes(); /* initialize */
79	>	invert = 0;
80	>	expand = 1;
81	>	newmod = NULL;
82	>	idprefix = NULL;
83
84		for (a = 1; a < argc; a++) {
85		if (argv[a][0] == '-')
86		switch (argv[a][1]) {
87		case 'm':
88	<	if (argv[a][2] \|\| a+1 >= argc)
88	>	if (argv[a][2] \| (a+1 >= argc))
89		break;
90	<	newmod = argv[++a];
90	>	a++;
91	>	if (newmod == NULL)
92	>	newmod = argv[a];
93		continue;
94		case 'n':
95	<	if (argv[a][2] \|\| a+1 >= argc)
95	>	if (argv[a][2] \| (a+1 >= argc))
96		break;
97	<	idprefix = argv[++a];
97	>	a++;
98	>	if (idprefix == NULL)
99	>	idprefix = argv[a];
100	>	else {
101	>	register char *newp;
102	>	newp = (char *)malloc(strlen(idprefix)+
103	>	strlen(argv[a])+2);
104	>	if (newp == NULL)
105	>	exit(2);
106	>	sprintf(newp, "%s.%s",
107	>	idprefix, argv[a]);
108	>	if (mal_prefix++)
109	>	free((void *)idprefix);
110	>	idprefix = newp;
111	>	}
112		continue;
113		case 'c':
114		if (argv[a][2])
#	Line 94 \| Line 123 \| *char argv[];**
123		case 'I':
124		if (argv[a][2])
125		break;
126	<	invert = 1;
126	>	invert = !invert;
127		continue;
128		}
129		break;
#	Line 105 \| Line 134 \| *char argv[];**
134
135		a += xf(&tot, argc-a, argv+a);
136
137	<	if (reverse = tot.sca < 0.0)
137	>	if ( (reverse = tot.sca < 0.0) )
138		tot.sca = -tot.sca;
139		if (invert)
140		reverse = !reverse;
#	Line 124 \| Line 153 \| *char argv[];**
153		putchar('\n');
154		/* transform input */
155		if (xac == argc) {
156	+	if (stdinused) {
157	+	fprintf(stderr, "%s: cannot use stdin more than once\n",
158	+	argv[0]);
159	+	exit(1);
160	+	}
161		openmain(NULL);
162		xform(mainfn, mainfp);
163		} else
#	Line 132 \| Line 166 \| *char argv[];**
166		xform(mainfn, mainfp);
167		}
168
169	+	if (mal_prefix)
170	+	free((void *)idprefix);
171		return(0);
172		}
173
174
175	<	doarray(ac, av, ai) /* make array */
176	<	char **av;
177	<	int ac, ai;
175	>	int
176	>	doargf( /* take argument list from file */
177	>	int ac,
178	>	char **av,
179	>	int fi
180	>	)
181		{
182	+	int inquote;
183		char newav[256], *avp;
184	+	char argbuf[2048];
185	+	char *newid, newidbuf[128];
186	+	char *oldid;
187	+	register char *cp;
188	+	FILE *argfp;
189	+	int n, i, k, newac, err;
190	+
191	+	if (fi >= ac-1 \|\| (av[fi+1][0] == '-' && av[fi+1][1] != '\0')) {
192	+	fprintf(stderr, "%s: missing file for -f option\n", av[0]);
193	+	exit(1);
194	+	}
195	+	if (av[fi+1][0] == '-' && av[fi+1][1] == '\0') {
196	+	if (stdinused++) {
197	+	fprintf(stderr,
198	+	"%s: cannot use stdin more than once\n",
199	+	av[0]);
200	+	exit(1);
201	+	}
202	+	argfp = stdin;
203	+	n = 100; /* we just don't know! */
204	+	} else {
205	+	if ((argfp = fopen(av[fi+1], "r")) == NULL) {
206	+	fprintf(stderr,
207	+	"%s: cannot open argument file \"%s\"\n",
208	+	av[0], av[fi+1]);
209	+	exit(1);
210	+	}
211	+	n = 0; /* count number of lines in file */
212	+	while (fgetline(argbuf,sizeof(argbuf),argfp) != NULL)
213	+	n += argbuf[0] && argbuf[0] != '#';
214	+	if (!n) {
215	+	fprintf(stderr, "%s: empty argument file \"%s\"\n",
216	+	av[0], av[fi+1]);
217	+	exit(1);
218	+	}
219	+	nrept *= n;
220	+	rewind(argfp);
221	+	}
222	+	err = 0; k = 0; /* read each arg list and call main */
223	+	while (fgetline(argbuf,sizeof(argbuf),argfp) != NULL) {
224	+	if (!argbuf[0] \|\| argbuf[0] == '#')
225	+	continue;
226	+	avp = newav+2;
227	+	avp[0] = av[0];
228	+	for (i = 1; i < fi; i++)
229	+	avp[i] = av[i];
230	+	newac = i;
231	+	cp = argbuf; /* parse new words */
232	+	if (*cp == '!') cp++;
233	+	if (!strncmp(cp, "xform ", 6)) cp += 6;
234	+	inquote = 0;
235	+	for ( ; ; ) {
236	+	skipspaces:
237	+	while (isspace(cp)) / nullify spaces */
238	+	*cp++ = '\0';
239	+	if ((cp == '"') \| (cp == '\''))
240	+	inquote = *cp++;
241	+	if (!cp) / all done? */
242	+	break;
243	+	if (cp[0] == '\\' && cp[1])
244	+	if (*++cp == '\n')
245	+	goto skipspaces;
246	+	avp[newac++] = cp; /* add argument to list */
247	+	if (inquote) {
248	+	while (*++cp)
249	+	if (*cp == inquote) {
250	+	*cp++ = '\0';
251	+	break;
252	+	}
253	+	} else {
254	+	while (++cp && !isspace(cp))
255	+	;
256	+	}
257	+	}
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];
266	+	if (strlen(oldid)+32 > sizeof(newidbuf)) {
267	+	newid = (char *)malloc(strlen(oldid)+32);
268	+	if (newid == NULL)
269	+	exit(2);
270	+	}
271	+	avp[i] = newid;
272	+	break;
273	+	}
274	+	if (oldid == NULL) {
275	+	newav[0] = av[0];
276	+	newav[1] = "-n";
277	+	newav[2] = newid;
278	+	avp = newav;
279	+	newac += 2;
280	+	}
281	+	if (oldid == NULL)
282	+	sprintf(newid, "i%d", k);
283	+	else
284	+	sprintf(newid, "%s.%d", oldid, k);
285	+	err \|= main(newac, avp);
286	+	if (newid != newidbuf)
287	+	free((void *)newid);
288	+	k++;
289	+	}
290	+	fclose(argfp);
291	+	return(err);
292	+	}
293	+
294	+
295	+	int
296	+	doarray( /* make array */
297	+	int ac,
298	+	char **av,
299	+	int ai
300	+	)
301	+	{
302	+	char newav[256], *avp;
303		char newid[128], repts[32];
304		char *oldid = NULL;
305		int n, i, err;
306
307	+	if (ai >= ac-1 \|\| (n = atoi(av[ai+1])) <= 0) {
308	+	fprintf(stderr, "%s: missing count for -a option\n", av[0]);
309	+	exit(1);
310	+	}
311	+	nrept *= n;
312		avp = newav+2;
313		avp[0] = av[0];
314		for (i = 1; i < ac; i++)
#	Line 163 \| Line 327 \| int ac, ai;
327		avp = newav;
328		ac += 2;
329		}
166	–	nrept *= n = atoi(av[ai+1]);
330		err = 0;
331		for (i = 0; i < n; i++) {
332		if (oldid == NULL)
#	Line 177 \| Line 340 \| int ac, ai;
340		}
341
342
343	<	xform(name, fin) /* transform stream by tot.xfm */
344	<	char *name;
345	<	register FILE *fin;
343	>	void
344	>	xform( /* transform stream by tot.xfm */
345	>	char *name,
346	>	register FILE *fin
347	>	)
348		{
349		int nobjs = 0;
350		register int c;
#	Line 210 \| Line 375 \| *register FILE fin;**
375		}
376
377
378	<	xfcomm(fname, fin) /* transform a command */
379	<	char *fname;
380	<	FILE *fin;
378	>	void
379	>	xfcomm( /* transform a command */
380	>	char *fname,
381	>	FILE *fin
382	>	)
383		{
217	–	extern FILE *popen();
218	–	extern char *fgetline();
384		FILE *pin;
385	<	char buf[512];
385	>	char buf[2048];
386		int i;
387
388		fgetline(buf, sizeof(buf), fin);
#	Line 232 \| Line 397 \| *FILE fin;**
397		} else {
398		printf("\n%s", buf);
399		if (xac > 1) {
400	<	printf(" \| %s", xav[0]);
400	>	printf(" \| %s -e", xav[0]); /* expand next time */
401		for (i = 1; i < xac; i++)
402	<	printf(" %s", xav[i]);
402	>	if (i >= xfa \|\| strcmp(xav[i], "-c"))
403	>	printf(" %s", xav[i]);
404		}
405		putchar('\n');
406		}
407		}
408
409
410	<	xfobject(fname, fin) /* transform an object */
411	<	char *fname;
412	<	FILE *fin;
410	>	void
411	>	xfobject( /* transform an object */
412	>	char *fname,
413	>	FILE *fin
414	>	)
415		{
248	–	extern char *strcpy();
416		char typ[16], nam[MAXSTR];
417		int fn;
418		/* modifier and type */
#	Line 257 \| Line 424 \| *FILE fin;**
424		progname, fname, typ);
425		exit(1);
426		}
427	<	if (ismodifier(fn))
428	<	printf("\n%s %s ", nam, typ);
429	<	else
430	<	printf("\n%s %s ", newmod != NULL ? newmod : nam,
431	<	invert ? ofun[tinvers[fn]].funame : typ);
427	>	putchar('\n');
428	>	if (ismodifier(fn)) {
429	>	fputword(nam, stdout);
430	>	printf(" %s ", typ);
431	>	} else {
432	>	fputword(newmod != NULL ? newmod : nam, stdout);
433	>	printf(" %s ", invert ? ofun[tinvers[fn]].funame : typ);
434	>	}
435		/* object name */
436		fgetword(nam, sizeof(nam), fin);
437		if (idprefix == NULL \|\| ismodifier(fn))
438	<	printf("%s\n", nam);
439	<	else
440	<	printf("%s.%s\n", idprefix, nam);
438	>	fputword(nam, stdout);
439	>	else {
440	>	char nnam[MAXSTR];
441	>	sprintf(nnam, "%s.%s", idprefix, nam);
442	>	fputword(nnam, stdout);
443	>	}
444	>	putchar('\n');
445		/* transform arguments */
446		if ((*ofun[fn].funp)(fin) < 0) {
447		fprintf(stderr, "%s: (%s): bad %s \"%s\"\n",
#	Line 277 \| Line 451 \| *FILE fin;**
451		}
452
453
454	<	o_default(fin) /* pass on arguments unchanged */
455	<	FILE *fin;
454	>	int
455	>	o_default( /* pass on arguments unchanged */
456	>	FILE *fin
457	>	)
458		{
459		register int i;
460		FUNARGS fa;
#	Line 287 \| Line 463 \| *FILE fin;**
463		return(-1);
464		/* string arguments */
465		printf("%d", fa.nsargs);
466	<	for (i = 0; i < fa.nsargs; i++)
467	<	printf(" %s", fa.sarg[i]);
466	>	for (i = 0; i < fa.nsargs; i++) {
467	>	fputc(' ', stdout);
468	>	fputword(fa.sarg[i], stdout);
469	>	}
470		printf("\n");
471		#ifdef IARGS
472		/* integer arguments */
#	Line 309 \| Line 487 \| *FILE fin;**
487		}
488
489
490	<	addxform(fin) /* add xf arguments to strings */
491	<	FILE *fin;
490	>	int
491	>	addxform( /* add xf arguments to strings */
492	>	FILE *fin
493	>	)
494		{
495		register int i;
496		int resetarr = 0;
#	Line 322 \| Line 502 \| *FILE fin;**
502		if (xac > xfa && strcmp(xav[xfa], "-i"))
503		resetarr = 2;
504		printf("%d", fa.nsargs + resetarr + xac-xfa);
505	<	for (i = 0; i < fa.nsargs; i++)
506	<	printf(" %s", fa.sarg[i]);
505	>	for (i = 0; i < fa.nsargs; i++) {
506	>	fputc(' ', stdout);
507	>	fputword(fa.sarg[i], stdout);
508	>	}
509		if (resetarr)
510		printf(" -i 1");
511		for (i = xfa; i < xac; i++) /* add xf arguments */
#	Line 349 \| Line 531 \| *FILE fin;**
531
532
533		int
534	<	otype(ofname) /* get object function number from its name */
535	<	register char *ofname;
534	>	alias( /* transfer alias */
535	>	FILE *fin
536	>	)
537		{
355	–	register int i;
356	–
357	–	for (i = 0; i < NUMTYPES; i++)
358	–	if (!strcmp(ofun[i].funame, ofname))
359	–	return(i);
360	–
361	–	return(-1); /* not found */
362	–	}
363	–
364	–
365	–	alias(fin) /* transfer alias */
366	–	FILE *fin;
367	–	{
538		char aliasnm[MAXSTR];
539
540		if (fgetword(aliasnm, MAXSTR, fin) == NULL)
#	Line 374 \| Line 544 \| *FILE fin;**
544		}
545
546
547	<	m_glow(fin) /* transform arguments for proximity light */
548	<	FILE *fin;
547	>	int
548	>	m_glow( /* transform arguments for proximity light */
549	>	FILE *fin
550	>	)
551		{
552		FUNARGS fa;
553
#	Line 392 \| Line 564 \| *FILE fin;**
564		}
565
566
567	<	m_spot(fin) /* transform arguments for spotlight */
568	<	FILE *fin;
567	>	int
568	>	m_spot( /* transform arguments for spotlight */
569	>	FILE *fin
570	>	)
571		{
572		FVECT v;
573		FUNARGS fa;
#	Line 412 \| Line 586 \| *FILE fin;**
586		}
587
588
589	<	m_mist(fin) /* transform arguments for mist */
590	<	FILE *fin;
589	>	int
590	>	m_mist( /* transform arguments for mist */
591	>	FILE *fin
592	>	)
593		{
594		FUNARGS fa;
595		int i;
596
597		if (readfargs(&fa, fin) != 1)
598		return(-1);
599	<	if (fa.nfargs > 5)
599	>	if (fa.nfargs > 7)
600		return(-1);
601		printf("%d", fa.nsargs);
602		if (idprefix == NULL)
#	Line 446 \| Line 622 \| *FILE fin;**
622		if (fa.nfargs > 2)
623		printf(" %12.6g %12.6g %12.6g", fa.farg[0]/tot.sca,
624		fa.farg[1]/tot.sca, fa.farg[2]/tot.sca);
625	<	if (fa.nfargs > 3)
626	<	printf(" %12.6g", fa.farg[3]);
451	<	if (fa.nfargs > 4)
452	<	printf(" %12.6g", fa.farg[4]);
625	>	for (i = 3; i < fa.nfargs; i++)
626	>	printf(" %12.6g", fa.farg[i]);
627		printf("\n");
628		freefargs(&fa);
629		return(0);
630		}
631
632
633	<	m_dielectric(fin) /* transform arguments for dielectric */
634	<	FILE *fin;
633	>	int
634	>	m_dielectric( /* transform arguments for dielectric */
635	>	FILE *fin
636	>	)
637		{
638		FUNARGS fa;
639
#	Line 476 \| Line 652 \| *FILE fin;**
652		}
653
654
655	<	m_interface(fin) /* transform arguments for interface */
656	<	FILE *fin;
655	>	int
656	>	m_interface( /* transform arguments for interface */
657	>	FILE *fin
658	>	)
659		{
660		FUNARGS fa;
661
#	Line 501 \| Line 679 \| *FILE fin;**
679		}
680
681
682	<	text(fin) /* transform text arguments */
683	<	FILE *fin;
682	>	int
683	>	text( /* transform text arguments */
684	>	FILE *fin
685	>	)
686		{
687		int i;
688		FVECT v;
#	Line 514 \| Line 694 \| *FILE fin;**
694		return(-1);
695		/* string arguments */
696		printf("%d", fa.nsargs);
697	<	for (i = 0; i < fa.nsargs; i++)
698	<	printf(" %s", fa.sarg[i]);
697	>	for (i = 0; i < fa.nsargs; i++) {
698	>	fputc(' ', stdout);
699	>	fputword(fa.sarg[i], stdout);
700	>	}
701		printf("\n0\n%d\n", fa.nfargs);
702		/* anchor point */
703		multp3(v, fa.farg, tot.xfm);
#	Line 538 \| Line 720 \| *FILE fin;**
720		}
721
722
723	<	o_source(fin) /* transform source arguments */
724	<	FILE *fin;
723	>	int
724	>	o_source( /* transform source arguments */
725	>	FILE *fin
726	>	)
727		{
728		FVECT dv;
729		FUNARGS fa;
#	Line 559 \| Line 743 \| *FILE fin;**
743		}
744
745
746	<	o_sphere(fin) /* transform sphere arguments */
747	<	FILE *fin;
746	>	int
747	>	o_sphere( /* transform sphere arguments */
748	>	FILE *fin
749	>	)
750		{
751		FVECT cent;
752		double rad;
#	Line 583 \| Line 769 \| *FILE fin;**
769		}
770
771
772	<	o_face(fin) /* transform face arguments */
773	<	FILE *fin;
772	>	int
773	>	o_face( /* transform face arguments */
774	>	FILE *fin
775	>	)
776		{
777		FVECT p;
778		register int i;
#	Line 609 \| Line 797 \| *FILE fin;**
797		}
798
799
800	<	o_cone(fin) /* transform cone and cup arguments */
801	<	FILE *fin;
800	>	int
801	>	o_cone( /* transform cone and cup arguments */
802	>	FILE *fin
803	>	)
804		{
805		FVECT p0, p1;
806		double r0, r1;
#	Line 636 \| Line 826 \| *FILE fin;**
826		}
827
828
829	<	o_cylinder(fin) /* transform cylinder and tube arguments */
830	<	FILE *fin;
829	>	int
830	>	o_cylinder( /* transform cylinder and tube arguments */
831	>	FILE *fin
832	>	)
833		{
834		FVECT p0, p1;
835		double rad;
#	Line 661 \| Line 853 \| *FILE fin;**
853		}
854
855
856	<	o_ring(fin) /* transform ring arguments */
857	<	FILE *fin;
856	>	int
857	>	o_ring( /* transform ring arguments */
858	>	FILE *fin
859	>	)
860		{
861		FVECT p0, pd;
862		double r0, r1;
#	Line 692 \| Line 886 \| *FILE fin;**
886		}
887
888
889	<	initotypes() /* initialize ofun[] array */
889	>	void
890	>	initotypes(void) /* initialize ofun[] array */
891		{
892		register int i;
893
894		if (ofun[OBJ_SOURCE].funp == o_source)
895		return; /* done already */
701	–	/* alias is additional */
702	–	ofun[ALIAS].funame = ALIASID;
703	–	ofun[ALIAS].flags = 0;
896		/* functions get new transform */
897	<	for (i = 0; i < NUMTYPES; i++)
897	>	for (i = 0; i < NUMOTYPE; i++)
898		if (hasfunc(i))
899		ofun[i].funp = addxform;
900		/* special cases */
#	Line 715 \| Line 907 \| *initotypes() / initialize ofun[] array /*
907		ofun[OBJ_CYLINDER].funp =
908		ofun[OBJ_TUBE].funp = o_cylinder;
909		ofun[OBJ_RING].funp = o_ring;
910	<	ofun[OBJ_INSTANCE].funp = addxform;
910	>	ofun[OBJ_INSTANCE].funp =
911	>	ofun[OBJ_MESH].funp = addxform;
912		ofun[MAT_GLOW].funp = m_glow;
913		ofun[MAT_SPOT].funp = m_spot;
914		ofun[MAT_DIELECTRIC].funp = m_dielectric;
#	Line 724 \| Line 917 \| *initotypes() / initialize ofun[] array /*
917		ofun[PAT_CTEXT].funp =
918		ofun[PAT_BTEXT].funp =
919		ofun[MIX_TEXT].funp = text;
920	<	ofun[ALIAS].funp = alias;
920	>	ofun[MOD_ALIAS].funp = alias;
921		/* surface inverses */
922		tinvers[OBJ_FACE] = OBJ_FACE;
923		tinvers[OBJ_SOURCE] = OBJ_SOURCE;
#	Line 740 \| Line 933 \| *initotypes() / initialize ofun[] array /*
933
934
935		#ifdef OLDXFORM
936	<	openmain(fname)
937	<	char *fname;
936	>	void
937	>	openmain(
938	>	char *fname
939	>	)
940		{
941		if (fname == NULL) {
942		strcpy(mainfn, "standard input");
#	Line 763 \| Line 958 \| *char fname;**
958		strcpy(mainfn, fname);
959		}
960		#else
961	<	openmain(fname) /* open fname for input, changing to its directory */
962	<	char *fname;
961	>	void
962	>	openmain( /* open input, changing directory for file */
963	>	char *iname
964	>	)
965		{
966	<	extern FILE *tmpfile();
967	<	extern char getlibpath(), getpath();
771	<	static char origdir[MAXPATH];
772	<	static char curfn[MAXPATH];
966	>	static char origdir[PATH_MAX];
967	>	static char curfn[PATH_MAX];
968		static int diffdir;
969		register char *fpath;
970
971	<	if (fname == NULL) { /* standard input */
971	>	if (iname == NULL) { /* standard input */
972		if (mainfp == NULL) {
973		register int c;
974		strcpy(mainfn, "standard input");
#	Line 790 \| Line 985 \| *char fname;**
985		}
986		while ((c = getc(stdin)) != EOF)
987		putc(c, mainfp);
793	–	fclose(stdin);
988		}
989		rewind(mainfp); /* rewind copy */
990		return;
991		}
992		if (mainfp == NULL) { /* first call, initialize */
993	<	getwd(origdir);
994	<	} else if (!strcmp(fname, curfn)) { /* just need to rewind? */
993	>	getcwd(origdir, sizeof(origdir));
994	>	} else if (!strcmp(iname, curfn)) { /* just need to rewind? */
995		rewind(mainfp);
996		return;
997		} else { /* else close old stream */
998		fclose(mainfp);
999	<	if (diffdir) {
999	>	mainfp = NULL;
1000	>	if (diffdir) { /* return to our directory */
1001		chdir(origdir);
1002		diffdir = 0;
1003		}
1004		}
1005	<	strcpy(curfn, fname); /* remember file name */
1006	<	/* get full path */
1007	<	if ((fpath = getpath(fname, getlibpath(), R_OK)) == NULL) {
1005	>	strcpy(curfn, iname); /* remember input name */
1006	>	/* get full path for file */
1007	>	if ((fpath = getpath(iname, getrlibpath(), R_OK)) == NULL) {
1008		fprintf(stderr, "%s: cannot find file \"%s\"\n",
1009	<	progname, fname);
1009	>	progname, iname);
1010		exit(1);
1011		}
1012		if (fpath[0] == '.' && ISDIRSEP(fpath[1])) /* remove leading ./ */
#	Line 839 \| Line 1034 \| *char fname;**
1034		diffdir++;
1035		}
1036		/* get final path component */
1037	<	for (fpath = fname+strlen(fname);
1038	<	fpath > fname && !ISDIRSEP(fpath[-1]); fpath--)
1037	>	for (fpath = iname+strlen(iname);
1038	>	fpath > iname && !ISDIRSEP(fpath[-1]); fpath--)
1039		;
1040		}
1041	<	/* open the file */
1041	>	/* finally, open the file */
1042		if ((mainfp = fopen(fpath, "r")) == NULL) {
1043		fprintf(stderr, "%s: cannot open file \"%s\"\n",
1044		progname, mainfn);

Diff Legend

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines

Comparing ray/src/gen/xform.c (file contents): Revision 2.13 by greg, Tue Jun 18 21:12:51 1996 UTC vs. Revision 2.42 by greg, Sun Jul 26 18:36:17 2009 UTC

Diff Legend

Comparing ray/src/gen/xform.c (file contents):
Revision 2.13 by greg, Tue Jun 18 21:12:51 1996 UTC vs.
Revision 2.42 by greg, Sun Jul 26 18:36:17 2009 UTC