--- ray/src/gen/genrev.c	2003/08/04 22:37:53	2.6
+++ ray/src/gen/genrev.c	2025/04/23 01:57:04	2.17
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char	RCSid[] = "$Id: genrev.c,v 2.6 2003/08/04 22:37:53 greg Exp $";
+static const char	RCSid[] = "$Id: genrev.c,v 2.17 2025/04/23 01:57:04 greg Exp $";
 #endif
 /*
  *  genrev.c - program to generate functions of rotation about z
@@ -12,9 +12,11 @@ static const char	RCSid[] = "$Id: genrev.c,v 2.6 2003/
  */
 
 #include  <stdlib.h>
-#include  <stdio.h>
-#include  <string.h>
 #include  <math.h>
+
+#include  "rtio.h"
+#include  "rterror.h"
+#include  "resolu.h"
 #include  "calcomp.h"
 
 #define  ZNAME		"Z`SYS`"		/* z function name */
@@ -29,11 +31,16 @@ static const char	RCSid[] = "$Id: genrev.c,v 2.6 2003/
 #define  UP		04
 #define  DOWN		010
 
-void	quit(), eputs(), wputs();
 
-
-computen(nzp, nrp, z0, r0, z1, r1)		/* compute normal */
-double  *nzp, *nrp, z0, r0, z1, r1;
+void
+computen(			/* compute normal */
+	double  *nzp,
+	double  *nrp,
+	double z0,
+	double r0,
+	double z1,
+	double r1
+)
 {
 	double  dr, dz, len;
 
@@ -45,43 +52,6 @@ double  *nzp, *nrp, z0, r0, z1, r1;
 }
 
 
-void
-eputs(msg)
-char  *msg;
-{
-	fputs(msg, stderr);
-}
-
-
-void
-wputs(msg)
-char  *msg;
-{
-	eputs(msg);
-}
-
-
-void
-quit(code)
-int  code;
-{
-	exit(code);
-}
-
-
-printhead(ac, av)		/* print command header */
-register int  ac;
-register char  **av;
-{
-	putchar('#');
-	while (ac--) {
-		putchar(' ');
-		fputs(*av++, stdout);
-	}
-	putchar('\n');
-}
-
-
 double
 l_hermite(char *nm)
 {
@@ -121,9 +91,11 @@ l_bspline(char *nm)
 }
 
 
-main(argc, argv)
-int  argc;
-char  *argv[];
+int
+main(
+	int  argc,
+	char  *argv[]
+)
 {
 	char  stmp[256];
 	char  *modname;
@@ -133,6 +105,8 @@ char  *argv[];
 	int  i, nseg;
 	int  orient;
 
+	esupport |= E_VARIABLE|E_FUNCTION|E_RCONST;
+	esupport &= ~(E_OUTCHAN|E_INCHAN);
 	varset("PI", ':', PI);
 	funset("hermite", 5, ':', l_hermite);
 	funset("bezier", 5, ':', l_bezier);
@@ -144,9 +118,15 @@ char  *argv[];
 	for (i = 6; i < argc; i++)
 		if (!strcmp(argv[i], "-e"))
 			scompile(argv[++i], NULL, 0);
-		else if (!strcmp(argv[i], "-f"))
-			fcompile(argv[++i]);
-		else if (!strcmp(argv[i], "-s"))
+		else if (!strcmp(argv[i], "-f")) {
+			char  *fpath = getpath(argv[++i], getrlibpath(), 0);
+			if (fpath == NULL) {
+				fprintf(stderr, "%s: cannot find file '%s'\n",
+						argv[0], argv[i]);
+				quit(1);
+			}
+			fcompile(fpath);
+		} else if (!strcmp(argv[i], "-s"))
 			smooth = 1;
 		else
 			goto userror;
@@ -155,13 +135,15 @@ char  *argv[];
 	scompile(stmp, NULL, 0);
 	sprintf(stmp, "%s(t)=%s;", RNAME, argv[4]);
 	scompile(stmp, NULL, 0);
-	nseg = atoi(argv[5]);
+	nseg = eval(argv[5]) + .5;
 	if (nseg <= 0)
 		goto userror;
 	modname = smooth ? "Phong" : argv[1];
 
-	printhead(argc, argv);
-	eclock = 0;
+	fputs("# ", stdout);
+	printargs(argc, argv, stdout);
+	doptimize(1);
+	eclock++;
 
 	lastnz = lastnr = 0.0;
 	t = 0.0;
@@ -196,13 +178,13 @@ char  *argv[];
 			printf("0\n4\n");
 			if (orient&(UP|DOWN)) {
 				t = (nextnz - lastnz)/(z - lastz);
-				printf("\t%15.9g\t%15.9g\n",
+				printf("\t%18.12g\t%18.12g\n",
 						t, lastnz - t*lastz);
 			} else
 				printf("\t0\t%d\n", orient&IN ? 1 : -1);
 			if (orient&(OUT|IN))  {
 				t = (nextnr - lastnr)/(r - lastr);
-				printf("\t%15.9g\t%15.9g\n",
+				printf("\t%18.12g\t%18.12g\n",
 						t, lastnr - t*lastr);
 			} else
 				printf("\t0\t%d\n", orient&UP ? 1 : -1);
@@ -212,23 +194,23 @@ char  *argv[];
 					orient&DOWN ? "tube" : "cylinder",
 					argv[2], i);
 			printf("0\n0\n7\n");
-			printf("\t0\t0\t%15.9g\n", lastz);
-			printf("\t0\t0\t%15.9g\n", z);
-			printf("\t%15.9g\n", r);
+			printf("\t0\t0\t%18.12g\n", lastz);
+			printf("\t0\t0\t%18.12g\n", z);
+			printf("\t%18.12g\n", r);
 		} else if (!(orient&(UP|DOWN))) {
 			printf("\n%s ring %s.%d\n", modname, argv[2], i);
 			printf("0\n0\n8\n");
-			printf("\t0\t0\t%15.9g\n", z);
-			printf("\t0\t0\t%15.9g\n", orient&IN ? 1.0 : -1.0);
-			printf("\t%15.9g\t%15.9g\n", lastr, r);
+			printf("\t0\t0\t%18.12g\n", z);
+			printf("\t0\t0\t%18.12g\n", orient&IN ? 1.0 : -1.0);
+			printf("\t%18.12g\t%18.12g\n", lastr, r);
 		} else {
 			printf("\n%s %s %s.%d\n", modname,
 					orient&DOWN ? "cup" : "cone",
 					argv[2], i);
 			printf("0\n0\n8\n");
-			printf("\t0\t0\t%15.9g\n", lastz);
-			printf("\t0\t0\t%15.9g\n", z);
-			printf("\t%15.9g\t%15.9g\n", lastr, r);
+			printf("\t0\t0\t%18.12g\n", lastz);
+			printf("\t0\t0\t%18.12g\n", z);
+			printf("\t%18.12g\t%18.12g\n", lastr, r);
 		}
 	endfor:
 		lastz = z; lastr = r;
@@ -236,13 +218,11 @@ char  *argv[];
 		lastnz = nz; lastnr = nr;
 		nz = nextnz; nr = nextnr;
 	}
-	quit(0);
+	return 0;
 
 userror:
 	fprintf(stderr,
 	"Usage: %s material name z(t) r(t) nseg [-e expr] [-f file] [-s]\n",
 			argv[0]);
-	quit(1);
+	return 1;
 }
-
-