--- ray/src/util/rtcontrib.c	2005/06/10 20:44:00	1.19
+++ ray/src/util/rtcontrib.c	2005/06/16 19:37:26	1.23
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char RCSid[] = "$Id: rtcontrib.c,v 1.19 2005/06/10 20:44:00 greg Exp $";
+static const char RCSid[] = "$Id: rtcontrib.c,v 1.23 2005/06/16 19:37:26 greg Exp $";
 #endif
 /*
  * Gather rtrace output to compute contributions from particular sources
@@ -196,7 +196,7 @@ main(int argc, char *argv[])
 				recover++;
 				continue;
 			case 'n':		/* number of processes */
-				if (argv[i][2] || i >= argc-1) break;
+				if (argv[i][2] || i >= argc-2) break;
 				nprocs = atoi(argv[++i]);
 				if (nprocs <= 0)
 					error(USER, "illegal number of processes");
@@ -221,7 +221,7 @@ main(int argc, char *argv[])
 			case 'f':		/* file or i/o format */
 				if (!argv[i][2]) {
 					char	*fpath;
-					if (i >= argc-1) break;
+					if (i >= argc-2) break;
 					fpath = getpath(argv[++i],
 							getrlibpath(), R_OK);
 					if (fpath == NULL) {
@@ -236,33 +236,33 @@ main(int argc, char *argv[])
 				setformat(argv[i]+2);
 				continue;
 			case 'e':		/* expression */
-				if (argv[i][2] || i >= argc-1) break;
+				if (argv[i][2] || i >= argc-2) break;
 				scompile(argv[++i], NULL, 0);
 				continue;
 			case 'o':		/* output file spec. */
-				if (argv[i][2] || i >= argc-1) break;
+				if (argv[i][2] || i >= argc-2) break;
 				curout = argv[++i];
 				continue;
 			case 'x':		/* horiz. output resolution */
-				if (argv[i][2] || i >= argc-1) break;
+				if (argv[i][2] || i >= argc-2) break;
 				xres = atoi(argv[++i]);
 				continue;
 			case 'y':		/* vert. output resolution */
-				if (argv[i][2] || i >= argc-1) break;
+				if (argv[i][2] || i >= argc-2) break;
 				yres = atoi(argv[++i]);
 				continue;
 			case 'b':		/* bin expression */
-				if (argv[i][2] || i >= argc-1) break;
+				if (argv[i][2] || i >= argc-2) break;
 				binval = argv[++i];
 				continue;
 			case 'm':		/* modifier name */
-				if (argv[i][2] || i >= argc-1) break;
+				if (argv[i][2] || i >= argc-2) break;
 				rtargv[rtargc++] = "-ti";
 				rtargv[rtargc++] = argv[++i];
 				addmodifier(argv[i], curout, binval);
 				continue;
 			case 'M':		/* modifier file */
-				if (argv[i][2] || i >= argc-1) break;
+				if (argv[i][2] || i >= argc-2) break;
 				rtargv[rtargc++] = "-tI";
 				rtargv[rtargc++] = argv[++i];
 				addmodfile(argv[i], curout, binval);
@@ -468,8 +468,11 @@ addmodfile(char *fname, char *outf, char *binv)
 {
 	char	*mname[MAXMODLIST];
 	int	i;
-					/* load the file & store strings */
-	wordfile(mname, fname);
+					/* find the file & store strings */
+	if (wordfile(mname, getpath(fname, getrlibpath(), R_OK)) < 0) {
+		sprintf(errmsg, "cannot find modifier file '%s'", fname);
+		error(SYSTEM, errmsg);
+	}
 	for (i = 0; mname[i]; i++)	/* add each one */
 		addmodifier(mname[i], outf, binv);
 }
@@ -620,10 +623,8 @@ getofile(const char *ospec, const char *mname, int bn)
 		if (header) {
 			char	info[512];
 			char	*cp = info;
-			if (ofl & OF_MODIFIER) {
-				sprintf(cp, "MODIFIER=%s\n", mname);
-				while (*cp) ++cp;
-			}
+			sprintf(cp, "MODIFIER=%s\n", mname);
+			while (*cp) ++cp;
 			if (ofl & OF_BIN) {
 				sprintf(cp, "BIN=%d\n", bn);
 				while (*cp) ++cp;
@@ -1029,8 +1030,13 @@ recover_output(FILE *fin)
 				error(USER, "cannot recover from command");
 						/* open output */
 			fp = fopen(oname, "rb+");
-			if (fp == NULL)
-				break;		/* must be end of modifier */
+			if (fp == NULL) {
+				if (j)
+					break;	/* assume end of modifier */
+				sprintf(errmsg, "missing recover file '%s'",
+						oname);
+				error(USER, errmsg);
+			}
 			nvals = lseek(fileno(fp), 0, SEEK_END);
 			if (nvals <= 0) {
 				lastout = 0;	/* empty output, quit here */