--- ray/src/px/pcomb.c	1991/05/27 09:01:05	1.18
+++ ray/src/px/pcomb.c	1991/08/14 15:00:34	1.21
@@ -22,10 +22,8 @@ static char SCCSid[] = "$SunId$ LBL";
 #define WINSIZ		9		/* scanline window size */
 #define MIDSCN		4		/* current scan position */
 
-#define BRT		(-1)		/* special index for brightness */
-
 struct {
-	char	*name;		/* file name */
+	char	*name;		/* file or command name */
 	FILE	*fp;		/* stream pointer */
 	COLOR	*scan[WINSIZ];	/* input scanline window */
 	COLOR	coef;		/* coefficient */
@@ -34,11 +32,11 @@ struct {
 
 int	nfiles;				/* number of input files */
 
-char	*vcolin[3] = {"ri", "gi", "bi"};
-char	*vcolout[3] = {"ro", "go", "bo"};
+char	vcolin[3][4] = {"ri", "gi", "bi"};
+char	vcolout[3][4] = {"ro", "go", "bo"};
 char	vbrtin[] = "li";
 char	vbrtout[] = "lo";
-char	*vcolexp[3] = {"re", "ge", "be"};
+char	vcolexp[3][4] = {"re", "ge", "be"};
 char	vbrtexp[] = "le";
 
 char	vnfiles[] = "nfiles";
@@ -61,12 +59,13 @@ int	xpos, ypos;			/* output position */
 
 int	wrongformat = 0;
 
+FILE	*popen();
 
+
 main(argc, argv)
 int	argc;
 char	*argv[];
 {
-	char	buf[128];
 	int	original;
 	double	f;
 	int	a, i;
@@ -124,7 +123,9 @@ char	*argv[];
 			}
 		else {
 			input[nfiles].name = argv[a];
-			input[nfiles].fp = fopen(argv[a], "r");
+			input[nfiles].fp = argv[a][0]=='!' ?
+					popen(argv[a]+1, "r") :
+					fopen(argv[a], "r");
 			if (input[nfiles].fp == NULL) {
 				perror(argv[a]);
 				quit(1);
@@ -148,16 +149,10 @@ char	*argv[];
 		if (argv[a][0] == '-')
 			switch (argv[a][1]) {
 			case 'x':
-				strcpy(buf, vxres);
-				strcat(buf, ":");
-				strcat(buf, argv[++a]);
-				scompile(buf, NULL, 0);
+				varset(vxres, ':', eval(argv[++a]));
 				continue;
 			case 'y':
-				strcpy(buf, vyres);
-				strcat(buf, ":");
-				strcat(buf, argv[++a]);
-				scompile(buf, NULL, 0);
+				varset(vyres, ':', eval(argv[++a]));
 				continue;
 			case 'w':
 				continue;
@@ -194,7 +189,7 @@ usage:
 	eputs("Usage: ");
 	eputs(argv[0]);
 	eputs(
-" [-w][-h][-x xr][-y yr][-e expr][-f file] [ [-s f][-c r g b] pic ..]\n");
+" [-w][-x xr][-y yr][-e expr][-f file] [ [-s f][-c r g b] pic ..]\n");
 	quit(1);
 }