--- ray/src/gen/xform.c	1989/10/04 16:28:14	1.7
+++ ray/src/gen/xform.c	1990/01/24 09:16:03	1.10
@@ -113,22 +113,29 @@ char  *argv[];
 	FILE  *fopen();
 	FILE  *fp;
 	int  a;
+					/* check for array */
+	for (a = 1; a < argc; a++)
+		if (!strcmp(argv[a], "-a"))
+			return(doarray(argc, argv, a));
 
-	xav = argv;
-
 	for (a = 1; a < argc; a++) {
 		if (argv[a][0] == '-')
 			switch (argv[a][1]) {
 			case 'n':
+				if (argv[a][2] || a+1 >= argc)
+					break;
 				idprefix = argv[++a];
 				continue;
 			case 'e':
+				if (argv[a][2])
+					break;
 				expand = 1;
 				continue;
 			}
 		break;
 	}
 
+	xav = argv;
 	xfa = a;
 
 	totscale = 1.0;
@@ -139,17 +146,23 @@ char  *argv[];
 	if (reverse = totscale < 0.0)
 		totscale = -totscale;
 
-	xac = a;
+	if (a < argc && argv[a][0] == '-') {
+		fprintf(stderr, "%s: command line error at '%s'\n",
+				argv[0], argv[a]);
+		exit(1);
+	}
 
-	putchar('#');				/* simple header */
+	xac = a;
+					/* simple header */
+	putchar('#');
 	for (a = 0; a < xac; a++)
 		printf(" %s", xav[a]);
 	putchar('\n');
-
-	if (a == argc)
+					/* transform input */
+	if (xac == argc)
 		xform("standard input", stdin);
 	else
-		for ( ; a < argc; a++) {
+		for (a = xac; a < argc; a++) {
 			if ((fp = fopen(argv[a], "r")) == NULL) {
 				fprintf(stderr, "%s: cannot open \"%s\"\n",
 						progname, argv[a]);
@@ -159,10 +172,50 @@ char  *argv[];
 			fclose(fp);
 		}
 
-	exit(0);
+	return(0);
 }
 
 
+doarray(ac, av, ai)			/* make array */
+char  **av;
+int  ac, ai;
+{
+	char  *newav[256], **avp;
+	char  newid[128], repts[32];
+	char  *oldid = NULL;
+	int  i, err;
+	
+	avp = newav+2;
+	avp[0] = av[0];
+	for (i = 1; i < ac; i++)
+		if (!strcmp(av[i-1], "-n")) {
+			oldid = av[i];
+			avp[i] = newid;
+		} else
+			avp[i] = av[i];
+	avp[ai] = "-i";
+	avp[ai+1] = repts;
+	avp[i] = NULL;
+	if (oldid == NULL) {
+		newav[0] = av[0];
+		newav[1] = "-n";
+		newav[2] = newid;
+		avp = newav;
+		ac += 2;
+	}
+	err = 0;
+	for (i = 0; i < atoi(av[ai+1]); i++) {
+		if (oldid == NULL)
+			sprintf(newid, "a%d", i);
+		else
+			sprintf(newid, "%s.%d", oldid, i);
+		sprintf(repts, "%d", i);
+		err |= main(ac, avp);
+	}
+	return(err);
+}
+
+
 xform(name, fin)			/* transform stream by totxform */
 char  *name;
 register FILE  *fin;
@@ -201,17 +254,26 @@ FILE  *fin;
 
 	fgetline(buf, sizeof(buf), fin);
 	if (expand) {
-		if ((pin = popen(buf+1, "r")) == NULL) {
-			fprintf(stderr, "%s: (%s): cannot execute \"%s\"\n",
-					progname, fname, buf);
-			exit(1);
+		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);
 		}
-		xform(buf, pin);
-		pclose(pin);
 	} else {
-		printf("\n%s | %s -e", buf, xav[0]);
-		for (i = 1; i < xac; i++)
-			printf(" %s", xav[i]);
+		printf("\n%s", buf);
+		if (xac > 1) {
+			printf(" | %s -e", xav[0]);
+			for (i = 1; i < xac; i++)
+				printf(" %s", xav[i]);
+		}
 		putchar('\n');
 	}
 }