--- ray/src/gen/genworm.c	2004/08/21 11:54:06	2.8
+++ ray/src/gen/genworm.c	2019/12/28 18:05:14	2.12
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char	RCSid[] = "$Id: genworm.c,v 2.8 2004/08/21 11:54:06 greg Exp $";
+static const char	RCSid[] = "$Id: genworm.c,v 2.12 2019/12/28 18:05:14 greg Exp $";
 #endif
 /*
  *  genworm.c - program to generate worms (strings with varying thickness).
@@ -12,11 +12,10 @@ static const char	RCSid[] = "$Id: genworm.c,v 2.8 2004
  */
 
 #include  <stdlib.h>
-#include  <stdio.h>
 #include  <math.h>
-#include  <string.h>
 
 #include  "calcomp.h"
+#include  "rtio.h"
 #include  "resolu.h"
 #include  "rterror.h"
 #include  "fvect.h"
@@ -45,6 +44,8 @@ char  *argv[];
 	FVECT  lastp, p;
 	int  i, nseg;
 
+	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);
@@ -56,9 +57,15 @@ char  *argv[];
 	for (i = 8; i < argc; i++)
 		if (!strcmp(argv[i], "-e"))
 			scompile(argv[++i], NULL, 0);
-		else if (!strcmp(argv[i], "-f"))
-			fcompile(argv[++i]);
-		else
+		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
 			goto userror;
 
 	sprintf(stmp, "%s(t)=%s;", XNAME, argv[3]);
@@ -69,7 +76,7 @@ char  *argv[];
 	scompile(stmp, NULL, 0);
 	sprintf(stmp, "%s(t)=%s;", RNAME, argv[6]);
 	scompile(stmp, NULL, 0);
-	nseg = atoi(argv[7]);
+	nseg = eval(argv[7]) + .5;
 	if (nseg <= 0)
 		goto userror;