--- ray/src/rt/func.c	1991/11/25 09:51:00	2.2
+++ ray/src/rt/func.c	1992/02/05 09:23:38	2.5
@@ -1,4 +1,4 @@
-/* Copyright (c) 1991 Regents of the University of California */
+/* Copyright (c) 1992 Regents of the University of California */
 
 #ifndef lint
 static char SCCSid[] = "$SunId$ LBL";
@@ -80,12 +80,12 @@ int  dofwd;
 	if (i == 1 && arg[ff][0] == '.')
 		setcontext(f->ctx = "");	/* "." means no file */
 	else {
-		strcpy(sbuf,m->oargs.sarg[ff]);	/* file name is context */
+		strcpy(sbuf,arg[ff]);	/* file name is context */
 		if (i > LCALSUF && !strcmp(sbuf+i-LCALSUF, CALSUF))
 			sbuf[i-LCALSUF] = '\0';	/* remove suffix */
 		setcontext(f->ctx = savestr(sbuf));
 		if (!vardefined(REFVNAME)) {	/* file loaded? */
-			loadfunc(m->oargs.sarg[ff]);
+			loadfunc(arg[ff]);
 			varset(REFVNAME, '=', 1.0);
 		} else				/* reference_count++ */
 			varset(REFVNAME, '=', varvalue(REFVNAME)+1.0);
@@ -111,14 +111,14 @@ int  dofwd;
 		f->f = f->b = &unitxf;
 	else {				/* get transform */
 		if ((f->b = (XF *)malloc(sizeof(XF))) == NULL)
-			goto memerr;;
+			goto memerr;
 		if (invxf(f->b, na-i, arg+i) != na-i)
 			objerror(m, USER, "bad transform");
 		if (f->b->sca < 0.0)
 			f->b->sca = -f->b->sca;
 		if (dofwd) {			/* do both transforms */
 			if ((f->f = (XF *)malloc(sizeof(XF))) == NULL)
-				goto memerr;;
+				goto memerr;
 			xf(f->f, na-i, arg+i);
 			if (f->f->sca < 0.0)
 				f->f->sca = -f->f->sca;
@@ -127,7 +127,7 @@ int  dofwd;
 	m->os = (char *)f;
 	return(f);
 toofew:
-	objerror(m, USER, "too few arguments");
+	objerror(m, USER, "too few string arguments");
 memerr:
 	error(SYSTEM, "out of memory in getfunc");
 }