--- ray/src/gen/xform.c	1992/03/12 11:43:58	2.3
+++ ray/src/gen/xform.c	1992/09/21 12:15:44	2.6
@@ -1,4 +1,4 @@
-/* Copyright (c) 1991 Regents of the University of California */
+/* Copyright (c) 1992 Regents of the University of California */
 
 #ifndef lint
 static char SCCSid[] = "$SunId$ LBL";
@@ -35,9 +35,9 @@ char  *newmod = NULL;			/* new modifier for surfaces *
 
 char  *idprefix = NULL;			/* prefix for object identifiers */
 
-#define  ALIAS		NUMOTYPE	/* put alias at end of array */
+#define	 ALIAS		NUMOTYPE	/* put alias at end of array */
 
-#define  NUMTYPES	(NUMOTYPE+1)	/* total number of object types */
+#define	 NUMTYPES	(NUMOTYPE+1)	/* total number of object types */
 
 FUN  ofun[NUMTYPES] = INIT_OTYPE;	/* default types and actions */
 
@@ -45,7 +45,7 @@ short  tinvers[NUMOTYPE];		/* inverse types for surfac
 
 extern char  *malloc(), *fgetword();
 
-#define  progname  (xav[0])
+#define	 progname  (xav[0])
 
 
 main(argc, argv)		/* get transform options and transform file */
@@ -197,6 +197,7 @@ register FILE  *fin;
 
 
 xfcomm(fname, fin)			/* transform a command */
+char  *fname;
 FILE  *fin;
 {
 	FILE  *popen();
@@ -207,19 +208,13 @@ FILE  *fin;
 
 	fgetline(buf, sizeof(buf), fin);
 	if (expand) {
-		if (xac > 2) {
-			if ((pin = popen(buf+1, "r")) == NULL) {
-				fprintf(stderr,
-				"%s: (%s): cannot execute \"%s\"\n",
-						progname, fname, buf);
-				exit(1);
-			}
-			xform(buf, pin);
-			pclose(pin);
-		} else {
-			fflush(stdout);
-			system(buf+1);
+		if ((pin = popen(buf+1, "r")) == NULL) {
+			fprintf(stderr, "%s: (%s): cannot execute \"%s\"\n",
+					progname, fname, buf);
+			exit(1);
 		}
+		xform(buf, pin);
+		pclose(pin);
 	} else {
 		printf("\n%s", buf);
 		if (xac > 1) {
@@ -272,7 +267,7 @@ o_default(fin)			/* pass on arguments unchanged */
 FILE  *fin;
 {
 	register int  i;
-	FUNARGS  fa;
+	FUNARGS	 fa;
 
 	if (readfargs(&fa, fin) != 1)
 		return(-1);
@@ -281,7 +276,7 @@ FILE  *fin;
 	for (i = 0; i < fa.nsargs; i++)
 		printf(" %s", fa.sarg[i]);
 	printf("\n");
-#ifdef  IARGS
+#ifdef	IARGS
 					/* integer arguments */
 	printf("%d", fa.niargs);
 	for (i = 0; i < fa.niargs; i++)
@@ -305,7 +300,7 @@ FILE  *fin;
 {
 	register int  i;
 	int  resetarr = 0;
-	FUNARGS  fa;
+	FUNARGS	 fa;
 
 	if (readfargs(&fa, fin) != 1)
 		return(-1);
@@ -320,7 +315,7 @@ FILE  *fin;
 	for (i = xfa; i < xac; i++)	/* add xf arguments */
 		printf(" %s", xav[i]);
 	printf("\n");
-#ifdef  IARGS
+#ifdef	IARGS
 					/* integer arguments */
 	printf("%d", fa.niargs);
 	for (i = 0; i < fa.niargs; i++)
@@ -368,7 +363,7 @@ FILE  *fin;
 m_glow(fin)			/* transform arguments for proximity light */
 FILE  *fin;
 {
-	FUNARGS  fa;
+	FUNARGS	 fa;
 
 	if (readfargs(&fa, fin) != 1)
 		return(-1);
@@ -387,7 +382,7 @@ m_spot(fin)			/* transform arguments for spotlight */
 FILE  *fin;
 {
 	FVECT  v;
-	FUNARGS  fa;
+	FUNARGS	 fa;
 
 	if (readfargs(&fa, fin) != 1)
 		return(-1);
@@ -406,8 +401,8 @@ FILE  *fin;
 m_dielectric(fin)		/* transform arguments for dielectric */
 FILE  *fin;
 {
-	double  pow();
-	FUNARGS  fa;
+	double	pow();
+	FUNARGS	 fa;
 
 	if (readfargs(&fa, fin) != 1)
 		return(-1);
@@ -427,8 +422,8 @@ FILE  *fin;
 m_interface(fin)		/* transform arguments for interface */
 FILE  *fin;
 {
-	double  pow();
-	FUNARGS  fa;
+	double	pow();
+	FUNARGS	 fa;
 
 	if (readfargs(&fa, fin) != 1)
 		return(-1);
@@ -455,11 +450,11 @@ FILE  *fin;
 {
 	int  i;
 	FVECT  v;
-	FUNARGS  fa;
+	FUNARGS	 fa;
 
 	if (readfargs(&fa, fin) != 1)
 		return(-1);
-	if (fa.nfargs != 9 && fa.nfargs != 11 && fa.nfargs != 15)
+	if (fa.nfargs < 9)
 		return(-1);
 					/* string arguments */
 	printf("%d", fa.nsargs);
@@ -474,16 +469,14 @@ FILE  *fin;
 	printf(" %18.12g %18.12g %18.12g\n", v[0], v[1], v[2]);
 					/* down vector */
 	multv3(v, fa.farg+6, tot.xfm);
-	printf(" %18.12g %18.12g %18.12g\n", v[0], v[1], v[2]);
-					/* forground and background */
-	if (fa.nfargs == 11)
-		printf(" %18.12g %18.12g\n", fa.farg[9], fa.farg[10]);
-	else if (fa.nfargs == 15) {
-		printf(" %18.12g %18.12g %18.12g\n",
-				fa.farg[9], fa.farg[10], fa.farg[11]);
-		printf(" %18.12g %18.12g %18.12g\n",
-				fa.farg[12], fa.farg[13], fa.farg[14]);
+	printf(" %18.12g %18.12g %18.12g", v[0], v[1], v[2]);
+					/* remaining arguments */
+	for (i = 9; i < fa.nfargs; i++) {
+		if (i%3 == 0)
+			putchar('\n');
+		printf(" %18.12g", fa.farg[i]);
 	}
+	putchar('\n');
 	freefargs(&fa);
 	return(0);
 }
@@ -493,7 +486,7 @@ o_source(fin)			/* transform source arguments */
 FILE  *fin;
 {
 	FVECT  dv;
-	FUNARGS  fa;
+	FUNARGS	 fa;
 
 	if (readfargs(&fa, fin) != 1)
 		return(-1);
@@ -514,15 +507,15 @@ o_sphere(fin)			/* transform sphere arguments */
 FILE  *fin;
 {
 	FVECT  cent;
-	double  rad;
-	FUNARGS  fa;
+	double	rad;
+	FUNARGS	 fa;
 
 	if (readfargs(&fa, fin) != 1)
 		return(-1);
 	if (fa.nsargs != 0  || fa.nfargs != 4)
 		return(-1);
 	
-	multp3(cent, fa.farg, tot.xfm);	/* transform center */
+	multp3(cent, fa.farg, tot.xfm); /* transform center */
 	
 	rad = fa.farg[3] * tot.sca;		/* scale radius */
 	
@@ -539,7 +532,7 @@ FILE  *fin;
 {
 	FVECT  p;
 	register int  i;
-	FUNARGS  fa;
+	FUNARGS	 fa;
 
 	if (readfargs(&fa, fin) != 1)
 		return(-1);
@@ -564,8 +557,8 @@ o_cone(fin)			/* transform cone and cup arguments */
 FILE  *fin;
 {
 	FVECT  p0, p1;
-	double  r0, r1;
-	FUNARGS  fa;
+	double	r0, r1;
+	FUNARGS	 fa;
 
 	if (readfargs(&fa, fin) != 1)
 		return(-1);
@@ -591,8 +584,8 @@ o_cylinder(fin)			/* transform cylinder and tube argum
 FILE  *fin;
 {
 	FVECT  p0, p1;
-	double  rad;
-	FUNARGS  fa;
+	double	rad;
+	FUNARGS	 fa;
 
 	if (readfargs(&fa, fin) != 1)
 		return(-1);
@@ -616,8 +609,8 @@ o_ring(fin)			/* transform ring arguments */
 FILE  *fin;
 {
 	FVECT  p0, pd;
-	double  r0, r1;
-	FUNARGS  fa;
+	double	r0, r1;
+	FUNARGS	 fa;
 
 	if (readfargs(&fa, fin) != 1)
 		return(-1);