--- ray/src/gen/xform.c	1999/06/04 09:26:04	2.17
+++ ray/src/gen/xform.c	2011/06/22 17:05:00	2.45
@@ -1,9 +1,6 @@
-/* Copyright (c) 1996 Regents of the University of California */
-
 #ifndef lint
-static char SCCSid[] = "$SunId$ LBL";
+static const char RCSid[] = "$Id: xform.c,v 2.45 2011/06/22 17:05:00 greg Exp $";
 #endif
-
 /*
  *  xform.c - program to transform object files.
  *		Transformations must preserve aspect ratio.
@@ -12,14 +9,14 @@ static char SCCSid[] = "$SunId$ LBL";
  *     11/6/86		Finally added error checking!
  */
 
-#include  "standard.h"
-
-#include  "paths.h"
-
 #include  <ctype.h>
 
+#include  "platform.h"
+#include  "paths.h"
+#include  "rtprocess.h" /* win_popen() */
+#include  "rtio.h"
+#include  "rtmath.h"
 #include  "object.h"
-
 #include  "otypes.h"
 
 int  xac;				/* global xform argument count */
@@ -29,39 +26,45 @@ int  xfa;				/* start of xf arguments */
 XF  tot;				/* total transformation */
 int  reverse;				/* boolean true if scene mirrored */
 
-int  invert = 0;			/* boolean true to invert surfaces */
+int  invert;				/* boolean true to invert surfaces */
 
-int  expand = 1;			/* boolean true to expand commands */
+int  expand;				/* boolean true to expand commands */
 
-char  *newmod = NULL;			/* new modifier for surfaces */
+char  *newmod;				/* new modifier for surfaces */
 
-char  *idprefix = NULL;			/* prefix for object identifiers */
+char  *idprefix;			/* prefix for object identifiers */
 
-#define	 ALIAS		NUMOTYPE	/* put alias at end of array */
+FUN  ofun[NUMOTYPE] = INIT_OTYPE;	/* default types and actions */
 
-#define	 NUMTYPES	(NUMOTYPE+1)	/* total number of object types */
-
-FUN  ofun[NUMTYPES] = INIT_OTYPE;	/* default types and actions */
-
 short  tinvers[NUMOTYPE];		/* inverse types for surfaces */
 
 int  nrept = 1;				/* number of array repetitions */
 
 int stdinused = 0;			/* stdin has been used by -f option? */
 
-extern char  *malloc(), *fgets(), *fgetword();
-
-char  mainfn[MAXPATH];			/* main file name */
+char  mainfn[PATH_MAX];			/* main file name */
 FILE  *mainfp = NULL;			/* main file pointer */
 
 #define	 progname  (xav[0])
 
+static int doargf(int ac, char **av, int fi);
+static int doarray(int ac, char **av, int ai);
+static void xform(char *name, FILE *fin);
+static void xfcomm(char *fname, FILE *fin);
+static void xfobject(char *fname, FILE *fin);
+static int addxform(FILE *fin);
+static int alias(FILE *fin);
+void initotypes(void); /* XXX conflict with otypes.h */
+static void openmain(char *iname);
 
-main(argc, argv)		/* get transform options and transform file */
-int  argc;
-char  *argv[];
+
+int
+main(		/* get transform options and transform file */
+	int  argc,
+	char  *argv[]
+)
 {
-	char  *fname;
+	int  mal_prefix = 0;
 	int  a;
 					/* check for argument list file */
 	for (a = 1; a < argc; a++)
@@ -72,20 +75,40 @@ char  *argv[];
 		if (!strcmp(argv[a], "-a"))
 			return(doarray(argc, argv, a));
 
-	initotypes();
+	initotypes();			/* initialize */
+	invert = 0;
+	expand = 1;
+	newmod = NULL;
+	idprefix = NULL;
 
 	for (a = 1; a < argc; a++) {
 		if (argv[a][0] == '-')
 			switch (argv[a][1]) {
 			case 'm':
-				if (argv[a][2] || a+1 >= argc)
+				if (argv[a][2] | (a+1 >= argc))
 					break;
-				newmod = argv[++a];
+				a++;
+				if (newmod == NULL)
+					newmod = argv[a];
 				continue;
 			case 'n':
-				if (argv[a][2] || a+1 >= argc)
+				if (argv[a][2] | (a+1 >= argc))
 					break;
-				idprefix = argv[++a];
+				a++;
+				if (idprefix == NULL)
+					idprefix = argv[a];
+				else {
+					register char	*newp;
+					newp = (char *)malloc(strlen(idprefix)+
+							strlen(argv[a])+2);
+					if (newp == NULL)
+						exit(2);
+					sprintf(newp, "%s.%s",
+							idprefix, argv[a]);
+					if (mal_prefix++)
+						free((void *)idprefix);
+					idprefix = newp;
+				}
 				continue;
 			case 'c':
 				if (argv[a][2])
@@ -100,7 +123,7 @@ char  *argv[];
 			case 'I':
 				if (argv[a][2])
 					break;
-				invert = 1;
+				invert = !invert;
 				continue;
 			}
 		break;
@@ -111,7 +134,7 @@ char  *argv[];
 
 	a += xf(&tot, argc-a, argv+a);
 
-	if (reverse = tot.sca < 0.0)
+	if ( (reverse = tot.sca < 0.0) )
 		tot.sca = -tot.sca;
 	if (invert)
 		reverse = !reverse;
@@ -143,17 +166,23 @@ char  *argv[];
 			xform(mainfn, mainfp);
 		}
 
+	if (mal_prefix)
+		free((void *)idprefix);
 	return(0);
 }
 
 
-doargf(ac, av, fi)			/* take argument list from file */
-char  **av;
-int  ac, fi;
+int
+doargf(			/* take argument list from file */
+	int ac,
+	char  **av,
+	int fi
+)
 {
+	int  inquote;
 	char  *newav[256], **avp;
 	char  argbuf[2048];
-	char  newid[128];
+	char  *newid, newidbuf[128];
 	char  *oldid;
 	register char	*cp;
 	FILE	*argfp;
@@ -165,7 +194,8 @@ int  ac, fi;
 	}
 	if (av[fi+1][0] == '-' && av[fi+1][1] == '\0') {
 		if (stdinused++) {
-			fprintf(stderr, "%s: cannot use stdin more than once\n",
+			fprintf(stderr,
+				"%s: cannot use stdin more than once\n",
 					av[0]);
 			exit(1);
 		}
@@ -173,13 +203,14 @@ int  ac, fi;
 		n = 100;		/* we just don't know! */
 	} else {
 		if ((argfp = fopen(av[fi+1], "r")) == NULL) {
-			fprintf(stderr, "%s: cannot open argument file \"%s\"\n",
+			fprintf(stderr,
+				"%s: cannot open argument file \"%s\"\n",
 					av[0], av[fi+1]);
 			exit(1);
 		}
 		n = 0;			/* count number of lines in file */
-		while (fgets(argbuf,sizeof(argbuf),argfp) != NULL)
-			n++;
+		while (fgetline(argbuf,sizeof(argbuf),argfp) != NULL)
+			n += argbuf[0] && argbuf[0] != '#';
 		if (!n) {
 			fprintf(stderr, "%s: empty argument file \"%s\"\n",
 					av[0], av[fi+1]);
@@ -188,30 +219,55 @@ int  ac, fi;
 		nrept *= n;
 		rewind(argfp);
 	}
-	err = 0;			/* read each arg list and call main */
-	for (k = 0; fgets(argbuf,sizeof(argbuf),argfp) != NULL; k++) {
+	err = 0; k = 0;			/* read each arg list and call main */
+	while (fgetline(argbuf,sizeof(argbuf),argfp) != NULL) {
+		if (!argbuf[0] || argbuf[0] == '#')
+			continue;
 		avp = newav+2;
 		avp[0] = av[0];
 		for (i = 1; i < fi; i++)
 			avp[i] = av[i];
 		newac = i;
-		cp = argbuf;			/* parse new words */
+		cp = argbuf;		/* parse new words */
+		if (*cp == '!') cp++;
+		if (!strncmp(cp, "xform ", 6)) cp += 6;
+		inquote = 0;
 		for ( ; ; ) {
+		skipspaces:
 			while (isspace(*cp))	/* nullify spaces */
 				*cp++ = '\0';
+			if ((*cp == '"') | (*cp == '\''))
+				inquote = *cp++;
 			if (!*cp)		/* all done? */
 				break;
+			if (cp[0] == '\\' && cp[1])
+				if (*++cp == '\n')
+					goto skipspaces;
 			avp[newac++] = cp;	/* add argument to list */
-			while (*++cp && !isspace(*cp))
-				;
+			if (inquote) {
+				while (*++cp)
+					if (*cp == inquote) {
+						*cp++ = '\0';
+						break;
+					}
+			} else {
+				while (*++cp && !isspace(*cp))
+					;
+			}
 		}
 		for (i = fi+2; i < ac; i++)
 			avp[newac++] = av[i];
 		avp[newac] = NULL;
+		newid = newidbuf;
 		oldid = NULL;
 		for (i = 2; i < newac; i++)
 			if (!strcmp(avp[i-1], "-n")) {
 				oldid = avp[i];
+				if (strlen(oldid)+32 > sizeof(newidbuf)) {
+					newid = (char *)malloc(strlen(oldid)+32);
+					if (newid == NULL)
+						exit(2);
+				}
 				avp[i] = newid;
 				break;
 			}
@@ -227,15 +283,21 @@ int  ac, fi;
 		else
 			sprintf(newid, "%s.%d", oldid, k);
 		err |= main(newac, avp);
+		if (newid != newidbuf)
+			free((void *)newid);
+		k++;
 	}
 	fclose(argfp);
 	return(err);
 }
 
 
-doarray(ac, av, ai)			/* make array */
-char  **av;
-int  ac, ai;
+int
+doarray(			/* make array */
+	int  ac,
+	char  **av,
+	int  ai
+)
 {
 	char  *newav[256], **avp;
 	char  newid[128], repts[32];
@@ -278,9 +340,11 @@ int  ac, ai;
 }
 
 
-xform(name, fin)			/* transform stream by tot.xfm */
-char  *name;
-register FILE  *fin;
+void
+xform(			/* transform stream by tot.xfm */
+	char  *name,
+	register FILE  *fin
+)
 {
 	int  nobjs = 0;
 	register int  c;
@@ -311,14 +375,14 @@ register FILE  *fin;
 }
 
 
-xfcomm(fname, fin)			/* transform a command */
-char  *fname;
-FILE  *fin;
+void
+xfcomm(			/* transform a command */
+	char  *fname,
+	FILE  *fin
+)
 {
-	extern FILE  *popen();
-	extern char  *fgetline();
 	FILE  *pin;
-	char  buf[512];
+	char  buf[2048];
 	int  i;
 
 	fgetline(buf, sizeof(buf), fin);
@@ -333,20 +397,22 @@ FILE  *fin;
 	} else {
 		printf("\n%s", buf);
 		if (xac > 1) {
-			printf(" | %s", xav[0]);
+			printf(" | %s -e", xav[0]);	/* expand next time */
 			for (i = 1; i < xac; i++)
-				printf(" %s", xav[i]);
+				if (i >= xfa || strcmp(xav[i], "-c"))
+					printf(" %s", xav[i]);
 		}
 		putchar('\n');
 	}
 }
 
 
-xfobject(fname, fin)				/* transform an object */
-char  *fname;
-FILE  *fin;
+void
+xfobject(				/* transform an object */
+	char  *fname,
+	FILE  *fin
+)
 {
-	extern char  *strcpy();
 	char  typ[16], nam[MAXSTR];
 	int  fn;
 						/* modifier and type */
@@ -358,17 +424,24 @@ FILE  *fin;
 				progname, fname, typ);
 		exit(1);
 	}
-	if (ismodifier(fn))
-		printf("\n%s %s ", nam, typ);
-	else
-		printf("\n%s %s ", newmod != NULL ? newmod : nam,
-				invert ? ofun[tinvers[fn]].funame : typ);
+	putchar('\n');
+	if (ismodifier(fn)) {
+		fputword(nam, stdout);
+		printf(" %s ", typ);
+	} else {
+		fputword(newmod != NULL ? newmod : nam, stdout);
+		printf(" %s ", invert ? ofun[tinvers[fn]].funame : typ);
+	}
 						/* object name */
 	fgetword(nam, sizeof(nam), fin);
 	if (idprefix == NULL || ismodifier(fn))
-		printf("%s\n", nam);
-	else
-		printf("%s.%s\n", idprefix, nam);
+		fputword(nam, stdout);
+	else {
+		char	nnam[MAXSTR];
+		sprintf(nnam, "%s.%s", idprefix, nam);
+		fputword(nnam, stdout);
+	}
+	putchar('\n');
 						/* transform arguments */
 	if ((*ofun[fn].funp)(fin) < 0) {
 		fprintf(stderr, "%s: (%s): bad %s \"%s\"\n",
@@ -378,8 +451,10 @@ FILE  *fin;
 }
 
 
-o_default(fin)			/* pass on arguments unchanged */
-FILE  *fin;
+int
+o_default(			/* pass on arguments unchanged */
+	FILE  *fin
+)
 {
 	register int  i;
 	FUNARGS	 fa;
@@ -388,8 +463,10 @@ FILE  *fin;
 		return(-1);
 					/* string arguments */
 	printf("%d", fa.nsargs);
-	for (i = 0; i < fa.nsargs; i++)
-		printf(" %s", fa.sarg[i]);
+	for (i = 0; i < fa.nsargs; i++) {
+		fputc(' ', stdout);
+		fputword(fa.sarg[i], stdout);
+	}
 	printf("\n");
 #ifdef	IARGS
 					/* integer arguments */
@@ -410,8 +487,10 @@ FILE  *fin;
 }
 
 
-addxform(fin)			/* add xf arguments to strings */
-FILE  *fin;
+int
+addxform(			/* add xf arguments to strings */
+	FILE  *fin
+)
 {
 	register int  i;
 	int  resetarr = 0;
@@ -423,8 +502,10 @@ FILE  *fin;
 	if (xac > xfa && strcmp(xav[xfa], "-i"))
 		resetarr = 2;
 	printf("%d", fa.nsargs + resetarr + xac-xfa);
-	for (i = 0; i < fa.nsargs; i++)
-		printf(" %s", fa.sarg[i]);
+	for (i = 0; i < fa.nsargs; i++) {
+		fputc(' ', stdout);
+		fputword(fa.sarg[i], stdout);
+	}
 	if (resetarr)
 		printf(" -i 1");
 	for (i = xfa; i < xac; i++)	/* add xf arguments */
@@ -450,22 +531,10 @@ FILE  *fin;
 
 
 int
-otype(ofname)			/* get object function number from its name */
-register char  *ofname;
+alias(			/* transfer alias */
+	FILE  *fin
+)
 {
-	register int  i;
-
-	for (i = 0; i < NUMTYPES; i++)
-		if (!strcmp(ofun[i].funame, ofname))
-			return(i);
-
-	return(-1);		/* not found */
-}
-
-
-alias(fin)			/* transfer alias */
-FILE  *fin;
-{
 	char  aliasnm[MAXSTR];
 
 	if (fgetword(aliasnm, MAXSTR, fin) == NULL)
@@ -475,8 +544,10 @@ FILE  *fin;
 }
 
 
-m_glow(fin)			/* transform arguments for proximity light */
-FILE  *fin;
+int
+m_glow(			/* transform arguments for proximity light */
+	FILE  *fin
+)
 {
 	FUNARGS	 fa;
 
@@ -493,8 +564,10 @@ FILE  *fin;
 }
 
 
-m_spot(fin)			/* transform arguments for spotlight */
-FILE  *fin;
+int
+m_spot(			/* transform arguments for spotlight */
+	FILE  *fin
+)
 {
 	FVECT  v;
 	FUNARGS	 fa;
@@ -513,8 +586,10 @@ FILE  *fin;
 }
 
 
-m_mist(fin)		/* transform arguments for mist */
-FILE  *fin;
+int
+m_mist(		/* transform arguments for mist */
+	FILE  *fin
+)
 {
 	FUNARGS	 fa;
 	int	i;
@@ -555,8 +630,10 @@ FILE  *fin;
 }
 
 
-m_dielectric(fin)		/* transform arguments for dielectric */
-FILE  *fin;
+int
+m_dielectric(		/* transform arguments for dielectric */
+	FILE  *fin
+)
 {
 	FUNARGS	 fa;
 
@@ -575,8 +652,10 @@ FILE  *fin;
 }
 
 
-m_interface(fin)		/* transform arguments for interface */
-FILE  *fin;
+int
+m_interface(		/* transform arguments for interface */
+	FILE  *fin
+)
 {
 	FUNARGS	 fa;
 
@@ -600,8 +679,10 @@ FILE  *fin;
 }
 
 
-text(fin)			/* transform text arguments */
-FILE  *fin;
+int
+text(			/* transform text arguments */
+	FILE  *fin
+)
 {
 	int  i;
 	FVECT  v;
@@ -613,8 +694,10 @@ FILE  *fin;
 		return(-1);
 					/* string arguments */
 	printf("%d", fa.nsargs);
-	for (i = 0; i < fa.nsargs; i++)
-		printf(" %s", fa.sarg[i]);
+	for (i = 0; i < fa.nsargs; i++) {
+		fputc(' ', stdout);
+		fputword(fa.sarg[i], stdout);
+	}
 	printf("\n0\n%d\n", fa.nfargs);
 					/* anchor point */
 	multp3(v, fa.farg, tot.xfm);
@@ -637,8 +720,10 @@ FILE  *fin;
 }
 
 
-o_source(fin)			/* transform source arguments */
-FILE  *fin;
+int
+o_source(			/* transform source arguments */
+	FILE  *fin
+)
 {
 	FVECT  dv;
 	FUNARGS	 fa;
@@ -658,8 +743,10 @@ FILE  *fin;
 }
 
 
-o_sphere(fin)			/* transform sphere arguments */
-FILE  *fin;
+int
+o_sphere(			/* transform sphere arguments */
+	FILE  *fin
+)
 {
 	FVECT  cent;
 	double	rad;
@@ -682,8 +769,10 @@ FILE  *fin;
 }
 
 
-o_face(fin)			/* transform face arguments */
-FILE  *fin;
+int
+o_face(			/* transform face arguments */
+	FILE  *fin
+)
 {
 	FVECT  p;
 	register int  i;
@@ -708,8 +797,10 @@ FILE  *fin;
 }
 
 
-o_cone(fin)			/* transform cone and cup arguments */
-FILE  *fin;
+int
+o_cone(			/* transform cone and cup arguments */
+	FILE  *fin
+)
 {
 	FVECT  p0, p1;
 	double	r0, r1;
@@ -735,8 +826,10 @@ FILE  *fin;
 }
 
 
-o_cylinder(fin)			/* transform cylinder and tube arguments */
-FILE  *fin;
+int
+o_cylinder(			/* transform cylinder and tube arguments */
+	FILE  *fin
+)
 {
 	FVECT  p0, p1;
 	double	rad;
@@ -760,8 +853,10 @@ FILE  *fin;
 }
 
 
-o_ring(fin)			/* transform ring arguments */
-FILE  *fin;
+int
+o_ring(			/* transform ring arguments */
+	FILE  *fin
+)
 {
 	FVECT  p0, pd;
 	double	r0, r1;
@@ -791,17 +886,15 @@ FILE  *fin;
 }
 
 
-initotypes()			/* initialize ofun[] array */
+void
+initotypes(void)			/* initialize ofun[] array */
 {
 	register int  i;
 
 	if (ofun[OBJ_SOURCE].funp == o_source)
 		return;			/* done already */
-					/* alias is additional */
-	ofun[ALIAS].funame = ALIASID;
-	ofun[ALIAS].flags = 0;
 					/* functions get new transform */
-	for (i = 0; i < NUMTYPES; i++)
+	for (i = 0; i < NUMOTYPE; i++)
 		if (hasfunc(i))
 			ofun[i].funp = addxform;
 					/* special cases */
@@ -814,7 +907,8 @@ initotypes()			/* initialize ofun[] array */
 	ofun[OBJ_CYLINDER].funp =
 	ofun[OBJ_TUBE].funp = o_cylinder;
 	ofun[OBJ_RING].funp = o_ring;
-	ofun[OBJ_INSTANCE].funp = addxform;
+	ofun[OBJ_INSTANCE].funp =
+	ofun[OBJ_MESH].funp = addxform;
 	ofun[MAT_GLOW].funp = m_glow;
 	ofun[MAT_SPOT].funp = m_spot;
 	ofun[MAT_DIELECTRIC].funp = m_dielectric;
@@ -823,7 +917,7 @@ initotypes()			/* initialize ofun[] array */
 	ofun[PAT_CTEXT].funp =
 	ofun[PAT_BTEXT].funp =
 	ofun[MIX_TEXT].funp = text;
-	ofun[ALIAS].funp = alias;
+	ofun[MOD_ALIAS].funp = alias;
 					/* surface inverses */
 	tinvers[OBJ_FACE] = OBJ_FACE;
 	tinvers[OBJ_SOURCE] = OBJ_SOURCE;
@@ -835,12 +929,15 @@ initotypes()			/* initialize ofun[] array */
 	tinvers[OBJ_CYLINDER] = OBJ_TUBE;
 	tinvers[OBJ_TUBE] = OBJ_CYLINDER;
 	tinvers[OBJ_INSTANCE] = OBJ_INSTANCE;	/* oh, well */
+	tinvers[OBJ_MESH] = OBJ_MESH;		/* ditto */
 }
 
 
 #ifdef  OLDXFORM
-openmain(fname)
-char  *fname;
+void
+openmain(
+	char  *fname
+)
 {
 	if (fname == NULL) {
 		strcpy(mainfn, "standard input");
@@ -862,17 +959,17 @@ char  *fname;
 	strcpy(mainfn, fname);
 }
 #else
-openmain(fname)		/* open fname for input, changing to its directory */
-char  *fname;
+void
+openmain(		/* open input, changing directory for file */
+	char  *iname
+)
 {
-	extern FILE  *tmpfile();
-	extern char  *getlibpath(), *getpath();
-	static char  origdir[MAXPATH];
-	static char  curfn[MAXPATH];
+	static char  origdir[PATH_MAX];
+	static char  curfn[PATH_MAX];
 	static int  diffdir;
 	register char  *fpath;
 
-	if (fname == NULL) {			/* standard input */
+	if (iname == NULL) {			/* standard input */
 		if (mainfp == NULL) {
 			register int  c;
 			strcpy(mainfn, "standard input");
@@ -889,28 +986,28 @@ char  *fname;
 			}
 			while ((c = getc(stdin)) != EOF)
 				putc(c, mainfp);
-			fclose(stdin);
 		}
 		rewind(mainfp);			/* rewind copy */
 		return;
 	}
 	if (mainfp == NULL) {			/* first call, initialize */
-		getwd(origdir);
-	} else if (!strcmp(fname, curfn)) {	/* just need to rewind? */
+		getcwd(origdir, sizeof(origdir));
+	} else if (!strcmp(iname, curfn)) {	/* just need to rewind? */
 		rewind(mainfp);
 		return;
 	} else {				/* else close old stream */
 		fclose(mainfp);
-		if (diffdir) {
+		mainfp = NULL;
+		if (diffdir) {			/* return to our directory */
 			chdir(origdir);
 			diffdir = 0;
 		}
 	}
-	strcpy(curfn, fname);			/* remember file name */
-						/* get full path */
-	if ((fpath = getpath(fname, getlibpath(), R_OK)) == NULL) {
+	strcpy(curfn, iname);			/* remember input name */
+						/* get full path for file */
+	if ((fpath = getpath(iname, getrlibpath(), R_OK)) == NULL) {
 		fprintf(stderr, "%s: cannot find file \"%s\"\n",
-				progname, fname);
+				progname, iname);
 		exit(1);
 	}
 	if (fpath[0] == '.' && ISDIRSEP(fpath[1]))	/* remove leading ./ */
@@ -938,11 +1035,11 @@ char  *fname;
 			diffdir++;
 		}
 						/* get final path component */
-		for (fpath = fname+strlen(fname);
-				fpath > fname && !ISDIRSEP(fpath[-1]); fpath--)
+		for (fpath = iname+strlen(iname);
+				fpath > iname && !ISDIRSEP(fpath[-1]); fpath--)
 			;
 	}
-						/* open the file */
+						/* finally, open the file */
 	if ((mainfp = fopen(fpath, "r")) == NULL) {
 		fprintf(stderr, "%s: cannot open file \"%s\"\n",
 				progname, mainfn);