--- ray/src/gen/xform.c	2003/06/27 22:27:45	2.27
+++ ray/src/gen/xform.c	2003/08/29 21:44:17	2.32
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char RCSid[] = "$Id: xform.c,v 2.27 2003/06/27 22:27:45 greg Exp $";
+static const char RCSid[] = "$Id: xform.c,v 2.32 2003/08/29 21:44:17 greg Exp $";
 #endif
 /*
  *  xform.c - program to transform object files.
@@ -40,7 +40,7 @@ int  nrept = 1;				/* number of array repetitions */
 
 int stdinused = 0;			/* stdin has been used by -f option? */
 
-char  mainfn[MAXPATH];			/* main file name */
+char  mainfn[PATH_MAX];			/* main file name */
 FILE  *mainfp = NULL;			/* main file pointer */
 
 #define	 progname  (xav[0])
@@ -72,14 +72,14 @@ char  *argv[];
 		if (argv[a][0] == '-')
 			switch (argv[a][1]) {
 			case 'm':
-				if (argv[a][2] | a+1 >= argc)
+				if (argv[a][2] | (a+1 >= argc))
 					break;
 				a++;
 				if (newmod == NULL)
 					newmod = argv[a];
 				continue;
 			case 'n':
-				if (argv[a][2] | a+1 >= argc)
+				if (argv[a][2] | (a+1 >= argc))
 					break;
 				a++;
 				if (idprefix == NULL)
@@ -121,7 +121,7 @@ char  *argv[];
 
 	a += xf(&tot, argc-a, argv+a);
 
-	if (reverse = tot.sca < 0.0)
+	if ( (reverse = tot.sca < 0.0) )
 		tot.sca = -tot.sca;
 	if (invert)
 		reverse = !reverse;
@@ -220,7 +220,7 @@ int  ac, fi;
 		skipspaces:
 			while (isspace(*cp))	/* nullify spaces */
 				*cp++ = '\0';
-			if ((*cp == '"' | *cp == '\''))
+			if ((*cp == '"') | (*cp == '\''))
 				inquote = *cp++;
 			if (!*cp)		/* all done? */
 				break;
@@ -836,7 +836,8 @@ initotypes()			/* initialize ofun[] array */
 	ofun[OBJ_CYLINDER].funp =
 	ofun[OBJ_TUBE].funp = o_cylinder;
 	ofun[OBJ_RING].funp = o_ring;
-	ofun[OBJ_INSTANCE].funp = addxform;
+	ofun[OBJ_INSTANCE].funp =
+	ofun[OBJ_MESH].funp = addxform;
 	ofun[MAT_GLOW].funp = m_glow;
 	ofun[MAT_SPOT].funp = m_spot;
 	ofun[MAT_DIELECTRIC].funp = m_dielectric;
@@ -887,8 +888,8 @@ char  *fname;
 openmain(iname)		/* open input, changing directory for file */
 char  *iname;
 {
-	static char  origdir[MAXPATH];
-	static char  curfn[MAXPATH];
+	static char  origdir[PATH_MAX];
+	static char  curfn[PATH_MAX];
 	static int  diffdir;
 	register char  *fpath;
 
@@ -914,7 +915,7 @@ char  *iname;
 		return;
 	}
 	if (mainfp == NULL) {			/* first call, initialize */
-		getwd(origdir);
+		getcwd(origdir, sizeof(origdir));
 	} else if (!strcmp(iname, curfn)) {	/* just need to rewind? */
 		rewind(mainfp);
 		return;