--- ray/src/gen/xform.c	1989/10/05 09:49:04	1.8
+++ ray/src/gen/xform.c	1990/01/24 09:16:03	1.10
@@ -122,9 +122,13 @@ char  *argv[];
 		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;
 			}
@@ -142,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]);
@@ -244,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');
 	}
 }