--- ray/src/util/rfluxmtx.c	2014/07/25 19:23:14	2.11
+++ ray/src/util/rfluxmtx.c	2014/08/15 19:59:56	2.15
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char RCSid[] = "$Id: rfluxmtx.c,v 2.11 2014/07/25 19:23:14 greg Exp $";
+static const char RCSid[] = "$Id: rfluxmtx.c,v 2.15 2014/08/15 19:59:56 greg Exp $";
 #endif
 /*
  * Calculate flux transfer matrix or matrices using rcontrib
@@ -11,6 +11,7 @@ static const char RCSid[] = "$Id: rfluxmtx.c,v 2.11 20
 #include <stdlib.h>
 #include "rtio.h"
 #include "rtmath.h"
+#include "rtprocess.h"
 #include "bsdf.h"
 #include "bsdf_m.h"
 #include "random.h"
@@ -144,20 +145,23 @@ surf_type(const char *otype)
 static char *
 oconv_command(int ac, char *av[])
 {
-	static char	oconvbuf[2048] = "!oconv -f";
-	char		*cp = oconvbuf + 9;
-
+	static char	oconvbuf[2048] = "!oconv -f ";
+	char		*cp = oconvbuf + 10;
+	char		*recv = *av++;
+	
+	if (ac-- <= 0)
+		return(NULL);
 	while (ac-- > 0) {
+		strcpy(cp, *av++);
+		while (*cp) cp++;
+		*cp++ = ' ';
 		if (cp >= oconvbuf+(sizeof(oconvbuf)-32)) {
 			fputs(progname, stderr);
 			fputs(": too many file arguments!\n", stderr);
 			exit(1);
 		}
-		*cp++ = ' ';
-		strcpy(cp, *av++);
-		while (*cp) cp++;
 	}
-	*cp = '\0';
+	strcpy(cp, recv);	/* receiver goes last */
 	return(oconvbuf);
 }
 
@@ -315,7 +319,7 @@ parse_params(PARAMS *p, char *pargs)
 	int	nparams = 0;
 	int	i;
 
-	for ( ; ; )
+	for ( ; ; ) {
 		switch (*cp++) {
 		case 'h':
 			if (*cp++ != '=')
@@ -338,6 +342,8 @@ parse_params(PARAMS *p, char *pargs)
 				break;
 			if (!get_direction(p->vup, cp))
 				break;
+			while (*cp && !isspace(*cp++))
+				;
 			++nparams;
 			continue;
 		case 'o':
@@ -356,14 +362,16 @@ parse_params(PARAMS *p, char *pargs)
 		case ' ':
 		case '\t':
 		case '\r':
-		case '\n':
 			continue;
+		case '\n':
 		case '\0':
 			return(nparams);
 		default:
 			break;
 		}
-	fprintf(stderr, "%s: bad parameter string '%s'\n", progname, pargs);
+		break;
+	}
+	fprintf(stderr, "%s: bad parameter string: %s", progname, pargs);
 	exit(1);
 	return(-1);	/* pro forma return */
 }
@@ -1182,9 +1190,20 @@ main(int argc, char *argv[])
 	int	a, i;
 					/* screen rcontrib options */
 	progname = argv[0];
-	for (a = 1; a < argc-2 && argv[a][0] == '-'; a++) {
-		int	na = 1;		/* !! Keep consistent !! */
-		switch (argv[a][1]) {
+	for (a = 1; a < argc-2; a++) {
+		int	na;
+					/* check for argument expansion */
+		while ((na = expandarg(&argc, &argv, a)) > 0)
+			;
+		if (na < 0) {
+			fprintf(stderr, "%s: cannot expand '%s'\n",
+					progname, argv[a]);
+			return(1);
+		}
+		if (argv[a][0] != '-' || !argv[a][1])
+			break;
+		na = 1;	
+		switch (argv[a][1]) {	/* !! Keep consistent !! */
 		case 'v':		/* verbose mode */
 			verbose = !verbose;
 			na = 0;
@@ -1259,8 +1278,6 @@ main(int argc, char *argv[])
 			if (!argv[a][2]) goto userr;
 			na = (argv[a][2] == 'e') | (argv[a][2] == 'a') ? 4 : 2;
 			break;
-		case '\0':		/* pass-through mode */
-			goto done_opts;
 		default:		/* anything else is verbotten */
 			goto userr;
 		}
@@ -1270,7 +1287,6 @@ main(int argc, char *argv[])
 		while (--na)		/* + arguments if any */
 			rcarg[nrcargs++] = argv[++a];
 	}
-done_opts:
 	if (a > argc-2)
 		goto userr;		/* check at end of options */
 	sendfn = argv[a++];		/* assign sender & receiver inputs */
@@ -1352,7 +1368,7 @@ done_opts:
 userr:
 	if (a < argc-2)
 		fprintf(stderr, "%s: unsupported option '%s'", progname, argv[a]);
-	fprintf(stderr, "Usage: %s [-v][rcontrib options] sender.rad receiver.rad [system.rad ..]\n",
+	fprintf(stderr, "Usage: %s [-v][rcontrib options] sender.rad receiver.rad [-i system.oct] [system.rad ..]\n",
 				progname);
 	return(1);
 }