--- ray/src/gen/mkillum.c	2011/10/05 17:20:55	2.38
+++ ray/src/gen/mkillum.c	2025/04/22 04:45:25	2.45
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char RCSid[] = "$Id: mkillum.c,v 2.38 2011/10/05 17:20:55 greg Exp $";
+static const char RCSid[] = "$Id: mkillum.c,v 2.45 2025/04/22 04:45:25 greg Exp $";
 #endif
 /*
  * Make illum sources for optimizing rendering process
@@ -8,7 +8,7 @@ static const char RCSid[] = "$Id: mkillum.c,v 2.38 201
 #include  <signal.h>
 #include  <ctype.h>
 
-#include  "rtprocess.h"	/* win_popen() */
+#include  "paths.h"		/* win_popen() */
 #include  "mkillum.h"
 
 				/* default parameters */
@@ -24,15 +24,12 @@ static const char RCSid[] = "$Id: mkillum.c,v 2.38 201
 
 struct illum_args  thisillum = {	/* our illum and default values */
 		0,
-		UDzpos,
-		0.,
 		DFLMAT,
 		DFLDAT,
 		0,
 		VOIDID,
 		SAMPDENS,
 		NSAMPS,
-		NULL,
 		0.,
 	};
 
@@ -48,10 +45,10 @@ int	doneheader = 0;		/* printed header yet? */
 int	warnings = 1;		/* print warnings? */
 
 void init(char *octnm, int np);
-void filter(register FILE	*infp, char	*name);
+void filter(FILE	*infp, char	*name);
 void xoptions(char	*s, char	*nm);
 void printopts(void);
-void printhead(register int  ac, register char  **av);
+void printhead(int  ac, char  **av);
 void xobject(FILE  *fp, char  *nm);
 
 
@@ -64,7 +61,7 @@ main(		/* compute illum distributions using rtrace */
 	int	nprocs = 1;
 	FILE	*fp;
 	int	rval;
-	register int	i;
+	int	i;
 				/* set global arguments */
 	gargv = argv;
 	progname = gargv[0];
@@ -151,7 +148,7 @@ init(char *octnm, int np)		/* start rendering process(
 
 void
 eputs(				/* put string to stderr */
-	register char  *s
+	const char  *s
 )
 {
 	static int  midline = 0;
@@ -167,8 +164,7 @@ eputs(				/* put string to stderr */
 
 
 void
-wputs(s)			/* print warning if enabled */
-char  *s;
+wputs(const char *s)			/* print warning if enabled */
 {
 	if (warnings)
 		eputs(s);
@@ -176,24 +172,25 @@ char  *s;
 
 
 void
-quit(ec)			/* make sure exit is called */
-int	ec;
+quit(int ec)			/* make sure exit is called */
 {
 	if (ray_pnprocs > 0)	/* close children if any */
-		ray_pclose(0);		
+		ray_pclose(0);
+	else if (ray_pnprocs < 0)
+		_exit(ec);	/* avoid flush() in child */
 	exit(ec);
 }
 
 
 void
 filter(		/* process stream */
-	register FILE	*infp,
+	FILE	*infp,
 	char	*name
 )
 {
 	char	buf[512];
 	FILE	*pfp;
-	register int	c;
+	int	c;
 
 	while ((c = getc(infp)) != EOF) {
 		if (isspace(c))
@@ -210,7 +207,10 @@ filter(		/* process stream */
 				error(SYSTEM, errmsg);
 			}
 			filter(pfp, buf);
-			pclose(pfp);
+			if (pclose(pfp) != 0) {
+				sprintf(errmsg, "bad status from \"%s\"", buf);
+				error(USER, errmsg);
+			}
 		} else {				/* object */
 			ungetc(c, infp);
 			xobject(infp, name);
@@ -225,11 +225,10 @@ xoptions(			/* process options in string s */
 	char	*nm
 )
 {
-	extern FILE	*freopen();
 	char	buf[64];
 	int	negax;
 	int	nerrs = 0;
-	register char	*cp;
+	char	*cp;
 
 	if (strncmp(s, "#@mkillum", 9) || !isspace(s[9])) {
 		fputs(s, stdout);		/* not for us */
@@ -307,22 +306,16 @@ xoptions(			/* process options in string s */
 			}
 			cp = sskip(cp);
 			continue;
-		case 'd':			/* sample density / BSDF data */
+		case 'd':			/* sample density */
 			if (*++cp != '=')
 				break;
-			if (thisillum.sd != NULL) {
-				free_BSDF(thisillum.sd);
-				thisillum.sd = NULL;
-			}
 			if (!*++cp || isspace(*cp))
 				continue;
 			if (isintd(cp, " \t\n\r")) {
 				thisillum.sampdens = atoi(cp);
 			} else {
-				atos(buf, sizeof(buf), cp);
-				thisillum.sd = load_BSDF(buf);
-				if (thisillum.sd == NULL)
-					break;
+				error(WARNING, "direct BSDF input unsupported");
+				goto opterr;
 			}
 			cp = sskip(cp);
 			continue;
@@ -368,50 +361,6 @@ xoptions(			/* process options in string s */
 			}
 			doneheader = 0;
 			continue;
-		case 'u':			/* up direction */
-			if (*++cp != '=')
-				break;
-			if (!*++cp || isspace(*cp)) {
-				thisillum.udir = UDunknown;
-				continue;
-			}
-			negax = 0;
-			if (*cp == '+')
-				cp++;
-			else if (*cp == '-') {
-				negax++;
-				cp++;
-			}
-			switch (*cp++) {
-			case 'x':
-			case 'X':
-				thisillum.udir = negax ? UDxneg : UDxpos;
-				break;
-			case 'y':
-			case 'Y':
-				thisillum.udir = negax ? UDyneg : UDypos;
-				break;
-			case 'z':
-			case 'Z':
-				thisillum.udir = negax ? UDzneg : UDzpos;
-				break;
-			default:
-				thisillum.udir = UDunknown;
-				break;
-			}
-			if (thisillum.udir == UDunknown || !isspace(*cp))
-				break;
-			continue;
-		case 't':			/* object thickness */
-			if (*++cp != '=')
-				break;
-			if (!isfltd(++cp, " \t\n\r"))
-				break;
-			thisillum.thick = atof(cp);
-			if (thisillum.thick < .0)
-				thisillum.thick = .0;
-			cp = sskip(cp);
-			continue;
 		case '!':			/* processed file! */
 			sprintf(errmsg, "(%s): already processed!", nm);
 			error(WARNING, errmsg);
@@ -457,36 +406,13 @@ printopts(void)			/* print out option default values *
 	printf("d=%d\t\t\t\t# density of directions\n", thisillum.sampdens);
 	printf("s=%d\t\t\t\t# samples per direction\n", thisillum.nsamps);
 	printf("b=%f\t\t\t# minimum average brightness\n", thisillum.minbrt);
-	switch (thisillum.udir) {
-	case UDzneg:
-		fputs("u=-Z\t\t\t\t# up is negative Z\n", stdout);
-		break;
-	case UDyneg:
-		fputs("u=-Y\t\t\t\t# up is negative Y\n", stdout);
-		break;
-	case UDxneg:
-		fputs("u=-X\t\t\t\t# up is negative X\n", stdout);
-		break;
-	case UDxpos:
-		fputs("u=+X\t\t\t\t# up is positive X\n", stdout);
-		break;
-	case UDypos:
-		fputs("u=+Y\t\t\t\t# up is positive Y\n", stdout);
-		break;
-	case UDzpos:
-		fputs("u=+Z\t\t\t\t# up is positive Z\n", stdout);
-		break;
-	case UDunknown:
-		break;
-	}
-	printf("t=%f\t\t\t# object thickness\n", thisillum.thick);
 }
 
 
 void
 printhead(			/* print out header */
-	register int  ac,
-	register char  **av
+	int  ac,
+	char  **av
 )
 {
 	putchar('#');